gpu: ion: Configuration changes

Added configuration changes to include all
dependencies needed by Tiler and enable by default

Change-Id: I6f7377b8caac991c046cb03ddbe1815101a5f3bd
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>

diff --git a/arch/arm/configs/android_dra7_defconfig b/arch/arm/configs/android_dra7_defconfig
index e55cc3f494ccbe310a4394a15edb110c5316dd87..6b91c89c85e738055a4462fb14ffc8bec3847f88 100644 (file)
--- a/arch/arm/configs/android_dra7_defconfig
+++ b/arch/arm/configs/android_dra7_defconfig
@@ -22,6 +22,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_OMAP=y
+CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX_DEBUG=y
 CONFIG_SOC_OMAP5=y
@@ -290,6 +291,10 @@ CONFIG_DMADEVICES=y
 CONFIG_TI_EDMA=y
 CONFIG_DMA_OMAP=y
 CONFIG_STAGING=y
+CONFIG_DRM=y
+CONFIG_DRM_OMAP=y
+CONFIG_DRM_OMAP_DISPLAY=n
+CONFIG_DRM_OMAP_DMM_TILER=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y

diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
index 09f65dc3d2c85397e4147e51291c1b7510450d03..cdc887dc3bf275f2df604ca53d7b37d31a443bbd 100644 (file)
--- a/drivers/gpu/drm/omapdrm/Kconfig
+++ b/drivers/gpu/drm/omapdrm/Kconfig
@@ -1,25 +1,39 @@
 
-config DRM_OMAP
+menuconfig DRM_OMAP
        tristate "OMAP DRM"
-       depends on DRM && !CONFIG_FB_OMAP2
-       depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
-       depends on OMAP2_DSS
+       depends on ARCH_OMAP2PLUS && DRM
+       default n
+       help
+         If you want to use the OMAP DRM Display driver and/or DMM/Tiler
+         driver, enable this.
+
+config DRM_OMAP_DISPLAY
+       tristate "OMAP DRM Display Driver"
+       depends on DRM_OMAP && !CONFIG_FB_OMAP2
        select DRM_KMS_HELPER
+       select OMAP2_DSS
        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
-       default n
+       select DRM_OMAP_DMM_TILER
+       default y
        help
          DRM display driver for OMAP2/3/4 based boards.
 
 config DRM_OMAP_NUM_CRTCS
+       depends on DRM_OMAP_DISPLAY
        int "Number of CRTCs"
        range 1 10
        default 1  if ARCH_OMAP2 || ARCH_OMAP3
        default 2  if ARCH_OMAP4
-       depends on DRM_OMAP
        help
          Select the number of video overlays which can be used as framebuffers.
          The remaining overlays are reserved for video.
 
+config DRM_OMAP_DMM_TILER
+       tristate "OMAP DMM TILER"
+       depends on DRM_OMAP
+       default y
+       help
+         Enable the DMM/Tiler driver for OMAP4+ boards.

diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile
index a6bddd858eb8531914f600c3199eb8b693f41d23..067975796caa2a7285c549b3223a18770688364d 100644 (file)
--- a/drivers/gpu/drm/omapdrm/Makefile
+++ b/drivers/gpu/drm/omapdrm/Makefile
@@ -15,10 +15,13 @@ omapdrm-y := omap_drv.o \
        omap_fbdev.o \
        omap_gem.o \
        omap_gem_dmabuf.o \
-       omap_dmm_tiler.o \
        sita.o
 
 # temporary:
 omapdrm-y += omap_gem_helpers.o
 
-obj-$(CONFIG_DRM_OMAP) += omapdrm.o
+omap-dmm-tiler-y := omap_dmm_tiler.o \
+       sita.o
+
+obj-$(CONFIG_DRM_OMAP_DMM_TILER) += omap-dmm-tiler.o
+obj-$(CONFIG_DRM_OMAP_DISPLAY) += omapdrm.o