summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9932185)
raw | patch | inline | side by side (parent: 9932185)
author | Vishal Mahaveer <vishalm@ti.com> | |
Mon, 30 May 2016 21:43:27 +0000 (17:43 -0400) | ||
committer | Vishal Mahaveer <vishalm@ti.com> | |
Mon, 30 May 2016 21:43:27 +0000 (17:43 -0400) |
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>
Kernel 4.4.x
Change-Id: I8ea93359975fd40614770a2d140596ec6e7860d0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX
index 52f178eb8da288854324e8ab34fd01cd7787ac62..5ec452a640c307f8e6ff03cac521b57e09913da7 100644 (file)
--- a/jacinto6/README.SGX
+++ b/jacinto6/README.SGX
[DDK Version]
1.12/2917986
[DDK commit ID]
- 3005661 um: Clear mte region clip state in emit masks.
+ ab0b57a tmp: Disable DVFS and SYNC for kernel 4.4
[Branch]
- android/1.12/2917986_k3.14_M
+ android/1.12/2917986_k4.4
[Kernel modules built against]
- Kernel Version: 3.14.y with CONFIG_MODVERSIONS=y
+ Kernel Version: 4.4.y with CONFIG_MODVERSIONS=y
[Build type]
release (export BUILD=release)
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index f8839cd795d133004d66e4937987f5506c3bffda..25ff59a25c96a34368a997453ea6d44acd077dfb 100644 (file)
Binary files a/jacinto6/sgx.tgz and b/jacinto6/sgx.tgz differ
Binary files a/jacinto6/sgx.tgz and b/jacinto6/sgx.tgz 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 e8976c9a4031032ef00181b539e09d48a31ba059..7697f1320dc4c77685fd1daa9ed60c1ab29516f1 100644 (file)
# This requires a new enough kernel version to have the base/sync driver.
#
ifeq ($(is_at_least_jellybean_mr1),1)
-EGL_EXTENSION_ANDROID_NATIVE_FENCE_SYNC := 1
-PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC := 1
+EGL_EXTENSION_ANDROID_NATIVE_FENCE_SYNC := 0
+PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC := 0
endif
##############################################################################
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 191544750b05a7358eba7b86a8b5afde800f079b..109e405d61f2a828b3a8c6eb842a61ac192e3409 100644 (file)
endif
ifeq ($(call kernel-version-at-least,3,0),true)
SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED := 1
- SYS_OMAP_HAS_DVFS_FRAMEWORK := 1
+ SYS_OMAP_HAS_DVFS_FRAMEWORK := 0
endif
else
$(warning "KERNELDIR is not set, so can't feature check DVFS or dsscomp.")
$(warning "Assuming we want DVFS and dsscomp support.")
SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED := 1
- SYS_OMAP_HAS_DVFS_FRAMEWORK := 1
+ SYS_OMAP_HAS_DVFS_FRAMEWORK := 0
endif
ifneq ($(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 29ef9f15a36aa23dc5d611c5c551b8c772ed9d37..40c969cccb5958b46a049bdef8548569d4306694 100644 (file)
#if defined(PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC)
#include <linux/file.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
+#include <asm/fcntl.h>
+#endif
#include <linux/version.h>
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0))
#include <linux/sync.h>
IMG_UINT32 i;
#if defined(PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
+ int iReleaseFd = get_unused_fd_flags(O_CLOEXEC);
+#else
int iReleaseFd = get_unused_fd();
+#endif
if(iReleaseFd < 0)
{
PVR_DPF((PVR_DBG_ERROR, "%s: Failed to find unused fd (%d)",