From: sangjin3.kim <sangjin3.kim@samsung.com>
Date: Mon, 26 Mar 2012 12:43:17 +0000 (+0900)
Subject: [Title] virtio-gl driver added.
X-Git-Tag: 2.2.1_release^2~151
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3144070534f7afcc49bf0f32c274351fb640a45c;p=sdk%2Femulator%2Femulator-kernel.git

[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 cd64046a9c85..3cdbb4765e16 100644
--- 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
new mode 100755
index 8965e41fb4dd..1047c57d227c
--- 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
new mode 100755
index badb3ec6af44..9e641972c91f
--- 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
new mode 100755
index e588758f1ace..afb7f59e5108
--- 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 */