jacinto6: sgx: Update SGX-BIN and KM src with omaplfb module

Omaplfb is now a kernel module. CONFIG_OMAPLFB should be disabled.

Change-Id: Ie4397def93ab8597895d3e41679a06f0aea1b01e
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>

diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX
index e8b317c559d5ea654b641cc03690b00fd4a21197..c39f59ff02a59f3cf6f26f22bbc378b340a7f7df 100644 (file)
--- a/jacinto6/README.SGX
+++ b/jacinto6/README.SGX
@@ -16,7 +16,7 @@ sgx.tgz a set of binaries built for SGX544.
 [DDK Version]
     1.12/2701748
 [DDK commit ID]
-    2b3d457 SGX-UM: Use correct mask variable for ion alloc data
+    2282139 omaplfb: changes for kernel 3.8
 [Branch]
     android/1.12/2701748
 [Kernel modules built against]

diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index d35388f7c640e925be13aa03cdfb05e998f0a87a..115b5f4534312980192cb4345494859ff379414a 100644 (file)
Binary files a/jacinto6/sgx.tgz and b/jacinto6/sgx.tgz differ

diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
index 35d9fd1ac0907ee7fb50f2e799f9ef98a88759b2..7a2d7c7f4b6a919a09562e37d0f818430f614262 100644 (file)
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
@@ -95,7 +95,7 @@ SUPPORT_LINUX_USING_WORKQUEUES := 1
 SUPPORT_PVRSRV_ANDROID_SYSTRACE := 0
 
 ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),0)
-#DISPLAY_CONTROLLER := omaplfb
+DISPLAY_CONTROLLER := omaplfb
 endif
 
 PVR_SYSTEM := omap
@@ -144,7 +144,7 @@ OMAP_NON_FLIP_DISPLAY := 1
 endif
 else # LDM_PLATFORM != 1
 ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),0)
-#DISPLAY_CONTROLLER_COMPONENT := dc_omapfb3_linux
+DISPLAY_CONTROLLER_COMPONENT := dc_omapfb3_linux
 endif
 endif # LDM_PLATFORM != 1
 

diff --git a/jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_displayclass.c b/jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_displayclass.c
index 5eeaea7659f9a92a77c7bc68c71a673f739efdba..7af5703cd6763b7d20721f960476107846a6eaae 100644 (file)
--- a/jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_displayclass.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_displayclass.c
@@ -93,7 +93,11 @@ extern struct ion_device *omap_ion_device;
 #error CONFIG_DSSCOMP support requires CONFIG_ION_OMAP
 #endif /* defined(CONFIG_ION_OMAP) */
 #if defined(CONFIG_DRM_OMAP_DMM_TILER)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#include <../drivers/gpu/drm/omapdrm/omap_dmm_tiler.h>
+#else
 #include <../drivers/staging/omapdrm/omap_dmm_tiler.h>
+#endif
 #include <../drivers/video/omap2/dsscomp/tiler-utils.h>
 #elif defined(CONFIG_TI_TILER)
 #include <mach/tiler.h>

diff --git a/jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c b/jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
index 88fdd0ac179ba10aa65ffe297ced4fa3a73c7adb..23747841e76a462d9419bc3ffb9ae410af672648 100644 (file)
--- a/jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
@@ -141,7 +141,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #if defined(CONFIG_DSSCOMP)
 #if defined(CONFIG_DRM_OMAP_DMM_TILER)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#include <../drivers/gpu/drm/omapdrm/omap_dmm_tiler.h>
+#else
 #include <../drivers/staging/omapdrm/omap_dmm_tiler.h>
+#endif
 #include <../drivers/video/omap2/dsscomp/tiler-utils.h>
 #elif defined(CONFIG_TI_TILER)
 #include <mach/tiler.h>
@@ -175,6 +179,11 @@ MODULE_SUPPORTED_DEVICE(DEVNAME);
 #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev)->output->manager
 #define        WAIT_FOR_VSYNC(man)     ((man)->wait_for_vsync)
 #else  /* defined(PVR_OMAPFB3_OMAP5_UEVM) */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev)->driver
+#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev)->output->manager
+#define        WAIT_FOR_VSYNC(man)     ((man)->wait_for_vsync)
+#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
 #define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev) != NULL ? (dev)->driver : NULL
 #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL
@@ -184,6 +193,7 @@ MODULE_SUPPORTED_DEVICE(DEVNAME);
 #define OMAP_DSS_MANAGER(man, dev) struct omap_dss_device *man = (dev)
 #define        WAIT_FOR_VSYNC(man)     ((man)->wait_vsync)
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */
+#endif  /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
 #endif /* defined(PVR_OMAPFB3_OMAP5_UEVM) */
 #endif /* !defined(PVR_OMAPLFB_DRM_FB) */