From: Shawn Guo <shawn.guo@freescale.com>
Date: Mon, 29 Jul 2013 06:33:49 +0000 (+0800)
Subject: ENGR00240988: ARM: imx: enable GPU support in defconfig
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a4ee29c704c6a75dbdda1dd4795fa9abcc338907;p=karo-tx-linux.git

ENGR00240988: ARM: imx: enable GPU support in defconfig

Turn on CMA with a 256 MiB pool and vivante gpu/drm options.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 7dd9c3234eba..8fdaaf6cb20d 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -73,6 +73,8 @@ CONFIG_NETFILTER=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
+CONFIG_CMA=y
+CONFIG_CMA_SIZE_MBYTES=256
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
@@ -174,6 +176,7 @@ CONFIG_SOC_CAMERA=y
 CONFIG_VIDEO_MX3=y
 CONFIG_SOC_CAMERA_OV2640=y
 CONFIG_DRM=y
+CONFIG_DRM_VIVANTE=y
 CONFIG_FB=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
@@ -211,6 +214,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MXC_IPU=y
+CONFIG_MXC_GPU_VIV=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_RTC_CLASS=y