[Title] virtio-gl driver added.

[Type] Feature
[Module] opengl-es
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/arch/x86/configs/i386_emul_defconfig b/arch/x86/configs/i386_emul_defconfig
index cd64046a9c856ed0ba8be378f495e7470ac0087c..3cdbb4765e16ddb936e9c5bdeec1c953d1b3acc3 100644 (file)
--- a/arch/x86/configs/i386_emul_defconfig
+++ b/arch/x86/configs/i386_emul_defconfig
@@ -1278,6 +1278,7 @@ CONFIG_NVRAM=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_TELCLOCK is not set
 CONFIG_VDPRAM_DEVICE=y
+CONFIG_VIRTIOGL=y
 CONFIG_DEVPORT=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
old mode 100644 (file)
new mode 100755 (executable)
index 8965e41..1047c57
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -1097,6 +1097,7 @@ config UV_MMTIMER
 
 source "drivers/char/tpm/Kconfig"
 
+
 config TELCLOCK
        tristate "Telecom clock driver for ATCA SBC"
        depends on EXPERIMENTAL && X86
@@ -1115,6 +1116,14 @@ config VDPRAM_DEVICE
        ---help---
          vdpram is telephony simulator works with the event injector.
 
+config VIRTIOGL
+       tristate "Virtio userspace memory transport"
+       depends on VIRTIO_PCI
+       default n
+       help
+         A Driver to facilitate transferring data from userspace to a
+         hypervisor (eg. qemu)
+
 config DEVPORT
        bool
        depends on !M68K

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
old mode 100644 (file)
new mode 100755 (executable)
index badb3ec..9e64197
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -99,6 +99,8 @@ obj-$(CONFIG_CS5535_GPIO)     += cs5535_gpio.o
 obj-$(CONFIG_GPIO_TB0219)      += tb0219.o
 obj-$(CONFIG_TELCLOCK)         += tlclk.o
 
+obj-$(CONFIG_VIRTIOGL)          += virtio-gl.o
+
 obj-$(CONFIG_MWAVE)            += mwave/
 obj-$(CONFIG_AGP)              += agp/
 obj-$(CONFIG_PCMCIA)           += pcmcia/

diff --git a/include/linux/virtio_ids.h b/include/linux/virtio_ids.h
old mode 100644 (file)
new mode 100755 (executable)
index e588758..afb7f59
--- a/include/linux/virtio_ids.h
+++ b/include/linux/virtio_ids.h
@@ -12,6 +12,7 @@
 #define VIRTIO_ID_CONSOLE      3 /* virtio console */
 #define VIRTIO_ID_RNG          4 /* virtio ring */
 #define VIRTIO_ID_BALLOON      5 /* virtio balloon */
+#define VIRTIO_ID_GL            6 /* virtio usermem */
 #define VIRTIO_ID_9P           9 /* 9p virtio console */
 #define VIRTIO_ID_GPI          20 /* virtio general purpose interface */