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>

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.
 [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 f8839cd..25ff59a 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
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
 # 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 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)),)
  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 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.
 
 #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>
@@ -3032,7 +3035,11 @@ PVRSRVSwapToDCBuffer2BW(IMG_UINT32 ui32BridgeID,
 	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)",