From: Allen Xu <allen.xu@freescale.com>
Date: Thu, 24 May 2012 02:42:51 +0000 (+0800)
Subject: ENGR00210559-2 Integrate gpu openGL2.1 and DRM
X-Git-Tag: v3.0.35-fsl~969
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eca4238f5ac195197d0a56f9bc3471201a2791aa;p=karo-tx-linux.git

ENGR00210559-2 Integrate gpu openGL2.1 and DRM

Add vivante drm modules code and select it in default config. Integrate
these code from vivante.

Signed-off-by: Allen Xu <allen.xu@freescale.com>
---

diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index 6ec55fd45f4b..7e41646f2a79 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1693,7 +1693,8 @@ CONFIG_USB_GSPCA=m
 #
 # Graphics support
 #
-# CONFIG_DRM is not set
+CONFIG_DRM=m
+CONFIG_DRM_VIVANTE=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y