summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Mahaveer2016-05-30 16:43:27 -0500
committerVishal Mahaveer2016-05-30 16:43:27 -0500
commitdc75e865734872b9da1bd16abb91f9a1a58bc920 (patch)
tree05b923931b9bde59e5fc38b8668ce643ad139fc1 /jacinto6
parent9932185e6b4e1bdc12d6138991aed4603ad33719 (diff)
downloaddevice-ti-proprietary-open-dc75e865734872b9da1bd16abb91f9a1a58bc920.tar.gz
device-ti-proprietary-open-dc75e865734872b9da1bd16abb91f9a1a58bc920.tar.xz
device-ti-proprietary-open-dc75e865734872b9da1bd16abb91f9a1a58bc920.zip
jacinto6: sgx-bin: sgx binaries and KM source update for Kernel 4.4
Updating SGX binaries and Kernel module source with support for Kernel 4.4.x Change-Id: I8ea93359975fd40614770a2d140596ec6e7860d0 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Diffstat (limited to 'jacinto6')
-rw-r--r--jacinto6/README.SGX6
-rw-r--r--jacinto6/sgx.tgzbin2867148 -> 2923411 bytes
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk4
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile4
-rw-r--r--jacinto6/sgx_src/eurasia_km/services4/srvkm/bridged/bridged_pvr_bridge.c7
5 files changed, 14 insertions, 7 deletions
diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX
index 52f178e..5ec452a 100644
--- a/jacinto6/README.SGX
+++ b/jacinto6/README.SGX
@@ -16,11 +16,11 @@ sgx.tgz a set of binaries built for SGX544.
16[DDK Version] 16[DDK Version]
17 1.12/2917986 17 1.12/2917986
18[DDK commit ID] 18[DDK commit ID]
19 3005661 um: Clear mte region clip state in emit masks. 19 ab0b57a tmp: Disable DVFS and SYNC for kernel 4.4
20[Branch] 20[Branch]
21 android/1.12/2917986_k3.14_M 21 android/1.12/2917986_k4.4
22[Kernel modules built against] 22[Kernel modules built against]
23 Kernel Version: 3.14.y with CONFIG_MODVERSIONS=y 23 Kernel Version: 4.4.y with CONFIG_MODVERSIONS=y
24[Build type] 24[Build type]
25 release (export BUILD=release) 25 release (export BUILD=release)
26 26
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index f8839cd..25ff59a 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
Binary files differ
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
index e8976c9..7697f13 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
@@ -198,8 +198,8 @@ endif
198# This requires a new enough kernel version to have the base/sync driver. 198# This requires a new enough kernel version to have the base/sync driver.
199# 199#
200ifeq ($(is_at_least_jellybean_mr1),1) 200ifeq ($(is_at_least_jellybean_mr1),1)
201EGL_EXTENSION_ANDROID_NATIVE_FENCE_SYNC := 1 201EGL_EXTENSION_ANDROID_NATIVE_FENCE_SYNC := 0
202PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC := 1 202PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC := 0
203endif 203endif
204 204
205############################################################################## 205##############################################################################
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 1915447..109e405 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
@@ -124,13 +124,13 @@ ifneq ($(strip $(KERNELDIR)),)
124 endif 124 endif
125 ifeq ($(call kernel-version-at-least,3,0),true) 125 ifeq ($(call kernel-version-at-least,3,0),true)
126 SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED := 1 126 SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED := 1
127 SYS_OMAP_HAS_DVFS_FRAMEWORK := 1 127 SYS_OMAP_HAS_DVFS_FRAMEWORK := 0
128 endif 128 endif
129else 129else
130 $(warning "KERNELDIR is not set, so can't feature check DVFS or dsscomp.") 130 $(warning "KERNELDIR is not set, so can't feature check DVFS or dsscomp.")
131 $(warning "Assuming we want DVFS and dsscomp support.") 131 $(warning "Assuming we want DVFS and dsscomp support.")
132 SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED := 1 132 SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED := 1
133 SYS_OMAP_HAS_DVFS_FRAMEWORK := 1 133 SYS_OMAP_HAS_DVFS_FRAMEWORK := 0
134endif 134endif
135 135
136ifneq ($(LDM_PLATFORM),1) 136ifneq ($(LDM_PLATFORM),1)
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/bridged/bridged_pvr_bridge.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/bridged/bridged_pvr_bridge.c
index 29ef9f1..40c969c 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/bridged/bridged_pvr_bridge.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/bridged/bridged_pvr_bridge.c
@@ -90,6 +90,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
90 90
91#if defined(PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC) 91#if defined(PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC)
92#include <linux/file.h> 92#include <linux/file.h>
93#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
94#include <asm/fcntl.h>
95#endif
93#include <linux/version.h> 96#include <linux/version.h>
94#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)) 97#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0))
95#include <linux/sync.h> 98#include <linux/sync.h>
@@ -3032,7 +3035,11 @@ PVRSRVSwapToDCBuffer2BW(IMG_UINT32 ui32BridgeID,
3032 IMG_UINT32 i; 3035 IMG_UINT32 i;
3033 3036
3034#if defined(PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC) 3037#if defined(PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC)
3038#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
3039 int iReleaseFd = get_unused_fd_flags(O_CLOEXEC);
3040#else
3035 int iReleaseFd = get_unused_fd(); 3041 int iReleaseFd = get_unused_fd();
3042#endif
3036 if(iReleaseFd < 0) 3043 if(iReleaseFd < 0)
3037 { 3044 {
3038 PVR_DPF((PVR_DBG_ERROR, "%s: Failed to find unused fd (%d)", 3045 PVR_DPF((PVR_DBG_ERROR, "%s: Failed to find unused fd (%d)",