Graphics: add GL3 Cache support for OSPM

BZ: 16808

This reverts commit 8dadfb803535c6d77eba52216c595f984706e19d.
and add GL3 enbling in mdfld kernel config

Change-Id: I5c784a831043c6bff4c2058f371a1a3a96516106
Signed-off-by: Randy Xu <randy.xu@intel.com>
Reviewed-on: http://android.intel.com:8080/32576
Reviewed-by: Pandit, Seema <seema.pandit@intel.com>
Reviewed-by: Stimson, DaleX B <dalex.b.stimson@intel.com>
Reviewed-by: Hu, Austin <austin.hu@intel.com>
Reviewed-by: Seibel, Eric <eric.seibel@intel.com>
Tested-by: Seibel, Eric <eric.seibel@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/arch/x86/configs/i386_mfld_defconfig b/arch/x86/configs/i386_mfld_defconfig
index 4db7841..1dab549 100644 (file)
--- a/arch/x86/configs/i386_mfld_defconfig
+++ b/arch/x86/configs/i386_mfld_defconfig
@@ -2368,7 +2368,7 @@ CONFIG_MDFLD_DSI_DSR=y
 # CONFIG_MDFLD_DSI_DPU is not set
 # CONFIG_MDFD_DUAL_MIPI is not set
 CONFIG_MDFD_HDMI=y
-# CONFIG_MDFD_GL3 is not set
+CONFIG_MDFD_GL3=y
 CONFIG_GFX_RTPM=y
 # CONFIG_SUPPORT_TOSHIBA_MIPI_DISPLAY is not set
 # CONFIG_SUPPORT_TMD_MIPI_600X1024_DISPLAY is not set

diff --git a/drivers/staging/mrst/medfield/Makefile b/drivers/staging/mrst/medfield/Makefile
index 52b1e3f..af892d5 100644 (file)
--- a/drivers/staging/mrst/medfield/Makefile
+++ b/drivers/staging/mrst/medfield/Makefile
@@ -94,16 +94,6 @@ endif
 ccflags-$(CONFIG_DRM_MID_RELEASE) += -DBUILD="\"release\"" -DPVR_BUILD_TYPE="\"release\"" -DRELEASE
 ccflags-$(CONFIG_DRM_MID_DEBUG) += -DBUILD="\"debug\"" -DPVR_BUILD_TYPE="\"debug\"" -DDEBUG -DDEBUG_LINUX_MEM_AREAS -DDEBUG_LINUX_MEMORY_ALLOCATIONS -DDEBUG_LINUX_MMAP_AREAS -DDEBUG_BRIDGE_KM
 ccflags-$(CONFIG_PCI_MSI) += -DCONFIG_PCI_MSI
-
-GL3_EXTERNAL_SYSTEM_CACHE ?=1
-ifeq ($(GL3_EXTERNAL_SYSTEM_CACHE),1)
-   SUPPORT_EXTERNAL_SYSTEM_CACHE = y
-   CONFIG_MDFD_GL3 = y
-else
-   SUPPORT_EXTERNAL_SYSTEM_CACHE =
-   CONFIG_MDFD_GL3 =
-endif
-
 ccflags-$(CONFIG_MDFD_GL3) += -DSUPPORT_EXTERNAL_SYSTEM_CACHE -DCONFIG_MDFD_GL3