summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHemant Hariyani2014-04-29 11:28:06 -0500
committerHemant Hariyani2014-04-29 11:28:06 -0500
commita810362f9b6a8842a3c79101420e6c9dfee0670e (patch)
tree2e9901c3dc6c6039b5b155997a2488f825f58461
parent8a44d3e9208c4bcbcc471a679190a7136f4eacc8 (diff)
downloaddevice-ti-proprietary-open-a810362f9b6a8842a3c79101420e6c9dfee0670e.tar.gz
device-ti-proprietary-open-a810362f9b6a8842a3c79101420e6c9dfee0670e.tar.xz
device-ti-proprietary-open-a810362f9b6a8842a3c79101420e6c9dfee0670e.zip
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>
-rw-r--r--jacinto6/README.SGX2
-rw-r--r--jacinto6/sgx.tgzbin3939315 -> 4109901 bytes
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile4
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_displayclass.c4
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c10
5 files changed, 17 insertions, 3 deletions
diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX
index e8b317c..c39f59f 100644
--- a/jacinto6/README.SGX
+++ b/jacinto6/README.SGX
@@ -16,7 +16,7 @@ sgx.tgz a set of binaries built for SGX544.
16[DDK Version] 16[DDK Version]
17 1.12/2701748 17 1.12/2701748
18[DDK commit ID] 18[DDK commit ID]
19 2b3d457 SGX-UM: Use correct mask variable for ion alloc data 19 2282139 omaplfb: changes for kernel 3.8
20[Branch] 20[Branch]
21 android/1.12/2701748 21 android/1.12/2701748
22[Kernel modules built against] 22[Kernel modules built against]
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index d35388f..115b5f4 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
Binary files 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 35d9fd1..7a2d7c7 100644
--- 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
95SUPPORT_PVRSRV_ANDROID_SYSTRACE := 0 95SUPPORT_PVRSRV_ANDROID_SYSTRACE := 0
96 96
97ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),0) 97ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),0)
98#DISPLAY_CONTROLLER := omaplfb 98DISPLAY_CONTROLLER := omaplfb
99endif 99endif
100 100
101PVR_SYSTEM := omap 101PVR_SYSTEM := omap
@@ -144,7 +144,7 @@ OMAP_NON_FLIP_DISPLAY := 1
144endif 144endif
145else # LDM_PLATFORM != 1 145else # LDM_PLATFORM != 1
146ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),0) 146ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),0)
147#DISPLAY_CONTROLLER_COMPONENT := dc_omapfb3_linux 147DISPLAY_CONTROLLER_COMPONENT := dc_omapfb3_linux
148endif 148endif
149endif # LDM_PLATFORM != 1 149endif # LDM_PLATFORM != 1
150 150
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 5eeaea7..7af5703 100644
--- 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;
93#error CONFIG_DSSCOMP support requires CONFIG_ION_OMAP 93#error CONFIG_DSSCOMP support requires CONFIG_ION_OMAP
94#endif /* defined(CONFIG_ION_OMAP) */ 94#endif /* defined(CONFIG_ION_OMAP) */
95#if defined(CONFIG_DRM_OMAP_DMM_TILER) 95#if defined(CONFIG_DRM_OMAP_DMM_TILER)
96#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
97#include <../drivers/gpu/drm/omapdrm/omap_dmm_tiler.h>
98#else
96#include <../drivers/staging/omapdrm/omap_dmm_tiler.h> 99#include <../drivers/staging/omapdrm/omap_dmm_tiler.h>
100#endif
97#include <../drivers/video/omap2/dsscomp/tiler-utils.h> 101#include <../drivers/video/omap2/dsscomp/tiler-utils.h>
98#elif defined(CONFIG_TI_TILER) 102#elif defined(CONFIG_TI_TILER)
99#include <mach/tiler.h> 103#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 88fdd0a..2374784 100644
--- 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.
141 141
142#if defined(CONFIG_DSSCOMP) 142#if defined(CONFIG_DSSCOMP)
143#if defined(CONFIG_DRM_OMAP_DMM_TILER) 143#if defined(CONFIG_DRM_OMAP_DMM_TILER)
144#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
145#include <../drivers/gpu/drm/omapdrm/omap_dmm_tiler.h>
146#else
144#include <../drivers/staging/omapdrm/omap_dmm_tiler.h> 147#include <../drivers/staging/omapdrm/omap_dmm_tiler.h>
148#endif
145#include <../drivers/video/omap2/dsscomp/tiler-utils.h> 149#include <../drivers/video/omap2/dsscomp/tiler-utils.h>
146#elif defined(CONFIG_TI_TILER) 150#elif defined(CONFIG_TI_TILER)
147#include <mach/tiler.h> 151#include <mach/tiler.h>
@@ -175,6 +179,11 @@ MODULE_SUPPORTED_DEVICE(DEVNAME);
175#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev)->output->manager 179#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev)->output->manager
176#define WAIT_FOR_VSYNC(man) ((man)->wait_for_vsync) 180#define WAIT_FOR_VSYNC(man) ((man)->wait_for_vsync)
177#else /* defined(PVR_OMAPFB3_OMAP5_UEVM) */ 181#else /* defined(PVR_OMAPFB3_OMAP5_UEVM) */
182#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
183#define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev)->driver
184#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev)->output->manager
185#define WAIT_FOR_VSYNC(man) ((man)->wait_for_vsync)
186#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
178#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) 187#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
179#define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev) != NULL ? (dev)->driver : NULL 188#define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev) != NULL ? (dev)->driver : NULL
180#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL 189#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL
@@ -184,6 +193,7 @@ MODULE_SUPPORTED_DEVICE(DEVNAME);
184#define OMAP_DSS_MANAGER(man, dev) struct omap_dss_device *man = (dev) 193#define OMAP_DSS_MANAGER(man, dev) struct omap_dss_device *man = (dev)
185#define WAIT_FOR_VSYNC(man) ((man)->wait_vsync) 194#define WAIT_FOR_VSYNC(man) ((man)->wait_vsync)
186#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */ 195#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */
196#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
187#endif /* defined(PVR_OMAPFB3_OMAP5_UEVM) */ 197#endif /* defined(PVR_OMAPFB3_OMAP5_UEVM) */
188#endif /* !defined(PVR_OMAPLFB_DRM_FB) */ 198#endif /* !defined(PVR_OMAPLFB_DRM_FB) */
189 199