Merge branch 'd-marshmallow-mr3-release' into d-nougat-released-nougat-release-test

* 'd-marshmallow-mr3-release' of /home/praneeth/omapzoom/proprietary-open/:
  sgx: 4.9 test patch
  earlyboot: remove warnings in pvr build
  jacinto6: update ipu2 binary
  km: Makefile: fix am57xevm target typo
  jacinto6: sgx-bin: sgx binaries update
  jacinto6: update SGX kernel module for latest kernel
  jacinto6: update SGX kernel module for latest kernel
  SGX: README: update instructions with new toolchain
  jacinto6: sgx-bin: bins and src update
  jacinto6: update SGX kernel module for latest kernel
  dra71-evm: Add touch firmware
  jacinto6: update SGX kernel module for latest kernel
  jacinto6: update SGX kernel module for latest kernel

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

Conflicts:
	jacinto6/sgx.tgz

18 files changed, 155 insertions, 228 deletions

diff --git a/Android.mk b/Android.mk
index 12fc0f3..d481147 100644
--- a/Android.mk
+++ b/Android.mk
@@ -42,6 +42,35 @@ endif
 #############################################
 
 #############################################
+# Install J6Entry touch firmware
+#############################################
+ifneq ($(TOUCH_TGZ),)
+ti-touch.untarred_intermediates := $(call intermediates-dir-for, FAKE, ti-touch.untarred)
+ti-touch.untarred_timestamp := $(ti-touch.untarred_intermediates)/stamp
+
+$(ti-touch.untarred_timestamp) : $(TOUCH_TGZ)
+	@echo "Unzip $(dir $@) <- $<)"
+	$(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
+	$(hide) tar -C $(dir $@) -zxf $<
+	$(hide) touch $@
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := $(TOUCH_BINARY)
+LOCAL_MODULE_CLASS := FAKE
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $(ti-touch.untarred_intermediates)/$(TOUCH_BINARY)
+$(LOCAL_BUILT_MODULE) : $(ti-touch.untarred_timestamp) | $(ACP)
+	@echo "Copy $@ <- $(PRIVATE_SRC)"
+	@mkdir -p $(dir $@)
+	$(hide) $(ACP) -fp $(PRIVATE_SRC) $@
+endif
+#############################################
+
+#############################################
 # Install Tesla-binary FW
 #############################################
 
diff --git a/jacinto6/LICENCE.Spectrum-GT9271 b/jacinto6/LICENCE.Spectrum-GT9271
new file mode 100644
index 0000000..ef319c4
--- /dev/null
+++ b/jacinto6/LICENCE.Spectrum-GT9271
@@ -0,0 +1,30 @@
+Copyright (c) 2016, Spectrum Digital Incorporated
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+DISCLAIMER.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/jacinto6/README.SGX b/jacinto6/README.SGX
index ce68344..ad64515 100644
--- a/jacinto6/README.SGX
+++ b/jacinto6/README.SGX
@@ -14,11 +14,11 @@
 sgx.tgz a set of binaries built for SGX544.
 
 [DDK Version]
-    1.14/4001660
+    1.14/4081762
 [DDK commit ID]
-    3ed372b um: gralloc: change stride alignment to 16 pixels
+    2a3afec gralloc: Dont translate formats on video encoder usage
 [Branch]
-    android/1.14/4001660_k4.4_M
+    android/1.14/4081762_k4.4_M
 [Kernel modules built against]
     Kernel Version: 4.4.y with CONFIG_MODVERSIONS=y
 [Build type]
@@ -34,13 +34,14 @@ Make sure kernel is built before building modules
 # cd ANDROID_ROOT/device/ti/proprietary-open/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/
 # export ANDROID_ROOT=path_to_android_fs_source
 # export KERNELDIR=path_to_kernel_source
-# export CROSS_COMPILE=$ANDROID_ROOT/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi-
-# export KERNEL_CROSS_COMPILE==$ANDROID_ROOT/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8/bin/arm-eabi-
+# export CROSS_COMPILE=$ANDROID_ROOT/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-
+# export KERNEL_CROSS_COMPILE=$ANDROID_ROOT/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-
 # export ARCH=arm
 # export PATH=<path to kernel toolchain>:$PATH
 
-To build for Jacinto6 (SGX 544 multi core):
+To build for Jacinto6/AM57x (SGX 544 multi core):
 # make TARGET_PRODUCT="jacinto6evm" BUILD=release
+# make TARGET_PRODUCT="am57xevm" BUILD=release
 
 Once the .ko is built, install it onto device (/system/lib/modules)
 
diff --git a/jacinto6/ducati_full_jacinto6evm.tgz b/jacinto6/ducati_full_jacinto6evm.tgz
index 71b540f..2cb5680 100644
--- a/jacinto6/ducati_full_jacinto6evm.tgz
+++ b/jacinto6/ducati_full_jacinto6evm.tgz
diff --git a/jacinto6/sgx.tgz b/jacinto6/sgx.tgz
index 8664309..f30df9e 100644
--- a/jacinto6/sgx.tgz
+++ b/jacinto6/sgx.tgz
diff --git a/jacinto6/sgx/Android.mk b/jacinto6/sgx/Android.mk
deleted file mode 100644
index 9d007ad..0000000
--- a/jacinto6/sgx/Android.mk
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-define _add-sgx-vendor-lib
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid SGX module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_PATH := $$(TARGET_OUT_VENDOR)/$(dir $1)
-LOCAL_STRIP_MODULE := false
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)
-LOCAL_PATH := $$(img-sgx.untarred_bin)
-include $$(BUILD_SYSTEM)/base_rules.mk
-$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
-$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
-	$(eval FIXED_SRC := $$(img-sgx.untarred_bin)/$(subst $(TARGET_BOARD_PLATFORM),jacinto6,$1))
-	@echo "Copy $$@ <- $(FIXED_SRC)"
-	@mkdir -p $(dir $$@)
-	$$(hide) $$(ACP) -fp $(FIXED_SRC) $$@
-endef
-
-define _add-sgx-vendor-bin
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid SGX module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $$(TARGET_OUT_VENDOR)/$(dir $1)
-LOCAL_STRIP_MODULE := false
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_EXECUTABLES)
-LOCAL_PATH := $$(img-sgx.untarred_bin)
-include $$(BUILD_SYSTEM)/base_rules.mk
-$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
-$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
-	@echo "Copy $$@ <- $$(PRIVATE_SRC)"
-	@mkdir -p $$(dir $$@)
-	$$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
-endef
-
-define _add-sgx-vendor-etc
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid SGX module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $$(TARGET_OUT)/$(dir $1)
-LOCAL_STRIP_MODULE := false
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_ETC)
-LOCAL_PATH := $$(img-sgx.untarred_bin)
-include $$(BUILD_SYSTEM)/base_rules.mk
-$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
-$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
-	@echo "Copy $$@ <- $$(PRIVATE_SRC)"
-	@mkdir -p $$(dir $$@)
-	$$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
-endef
-
-define _add-sgx-vendor-km
-include $$(CLEAR_VARS)
-$(if $(word 2,$1),$(error Invalid SGX module name $1))
-LOCAL_MODULE := $(basename $(notdir $1))
-LOCAL_SRC_FILES := $1
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(suffix $1)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $$(TARGET_OUT)/lib/$(dir $1)
-LOCAL_STRIP_MODULE := false
-OVERRIDE_BUILT_MODULE_PATH := $$(TARGET_OUT_INTERMEDIATE_ETC)
-LOCAL_PATH := $$(img-sgx.untarred_bin)
-include $$(BUILD_SYSTEM)/base_rules.mk
-$$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
-$$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
-	@echo "Copy $$@ <- $$(PRIVATE_SRC)"
-	@mkdir -p $$(dir $$@)
-	$$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
-endef
-
-prebuilt_sgx_vendor_libs := \
-	lib/libIMGegl.so \
-	lib/libglslcompiler.so \
-	lib/libusc.so \
-	lib/libPVRScopeServices.so \
-	lib/libsrv_um.so \
-	lib/hw/gralloc.$(TARGET_BOARD_PLATFORM).so \
-	lib/hw/memtrack.$(TARGET_BOARD_PLATFORM).so \
-	lib/libpvrANDROID_WSEGL.so \
-	lib/libpvr2d.so \
-	lib/libsrv_init.so \
-	lib/egl/libGLESv1_CM_POWERVR_SGX544_116.so \
-	lib/egl/libGLESv2_POWERVR_SGX544_116.so \
-	lib/egl/libEGL_POWERVR_SGX544_116.so
-
-prebuilt_sgx_vendor_bins := \
-	bin/pvrsrvinit \
-	bin/pvrsrvctl
-
-#prebuilt_sgx_vendor_etc := \
-#	etc/powervr.ini
-
-prebuilt_sgx_vendor_km := \
-	modules/pvrsrvkm.ko
-
-prebuilt_sgx_modules := \
-  $(foreach _file,$(prebuilt_sgx_vendor_libs) $(prebuilt_sgx_vendor_bins) $(prebuilt_sgx_vendor_etc) $(prebuilt_sgx_vendor_km),\
-    $(notdir $(basename $(_file))))
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ti_jacinto6_sgx_libs
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := $(prebuilt_sgx_modules)
-include $(BUILD_PHONY_PACKAGE)
-
-$(foreach _file,$(prebuilt_sgx_vendor_libs),\
-  $(eval $(call _add-sgx-vendor-lib,$(_file))))
-
-$(foreach _file,$(prebuilt_sgx_vendor_bins),\
-  $(eval $(call _add-sgx-vendor-bin,$(_file))))
-
-$(foreach _file,$(prebuilt_sgx_vendor_etc),\
-  $(eval $(call _add-sgx-vendor-etc,$(_file))))
-
-$(foreach _file,$(prebuilt_sgx_vendor_km),\
-  $(eval $(call _add-sgx-vendor-km,$(_file))))
-
-prebuilt_sgx_modules :=
-prebuilt_sgx_vendor_libs :=
-prebuilt_sgx_vendor_bins :=
-prebuilt_sgx_vendor_etc :=
-prebuilt_sgx_vendor_km :=
-_add-sgx-vendor-lib :=
-_add-sgx-vendor-bin :=
-_add-sgx-vendor-etc :=
-_add-sgx-vendor-km :=
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
index b93243b..9b49915 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
@@ -48,13 +48,14 @@
 
 # These flags are used for kernel, User C and User C++
 #
-COMMON_FLAGS := -W -Wall
+# COMMON_FLAGS := -W 
+#-Wall
 
 # Some GCC warnings are C only, so we must mask them from C++
 #
-COMMON_CFLAGS := $(COMMON_FLAGS) \
- -Wdeclaration-after-statement -Wno-format-zero-length \
- -Wstrict-prototypes
+#COMMON_CFLAGS := $(COMMON_FLAGS) \
+# -Wdeclaration-after-statement -Wno-format-zero-length \
+# -Wstrict-prototypes
 
 # User C and User C++ optimization control. Does not affect kernel.
 #
@@ -71,7 +72,7 @@ endif
 
 # FIXME: We should probably audit the driver for aliasing
 #
-COMMON_USER_FLAGS += -fno-strict-aliasing
+#COMMON_USER_FLAGS += -fno-strict-aliasing
 
 # We always enable debugging. Either the release binaries are stripped
 # and the symbols put in the symbolpackage, or we're building debug.
@@ -80,9 +81,9 @@ COMMON_USER_FLAGS += -g $(ANDROID_FPGA_FORCE_32BIT)
 
 # User C and User C++ warning flags
 #
-COMMON_USER_FLAGS += \
- -Wpointer-arith -Wunused-parameter \
- -Wmissing-format-attribute
+#COMMON_USER_FLAGS += \
+# -Wpointer-arith -Wunused-parameter \
+# -Wmissing-format-attribute
 
 # Additional warnings, and optional warnings.
 #
@@ -158,36 +159,11 @@ TESTED_TARGET_USER_FLAGS += \
 TESTED_HOST_USER_FLAGS += \
  $(call host-cc-optional-warning,-Wunused-but-set-variable)
 
-KBUILD_FLAGS := \
- -Wno-unused-parameter -Wno-sign-compare
+#KBUILD_FLAGS := \
+# -Wno-unused-parameter -Wno-sign-compare
 
-TESTED_KBUILD_FLAGS := \
- $(call kernel-cc-option,-Wmissing-include-dirs) \
- $(call kernel-cc-option,-Wno-type-limits) \
- $(call kernel-cc-option,-Wno-pointer-arith) \
- $(call kernel-cc-option,-Wno-aggregate-return) \
- $(call kernel-cc-option,-Wno-unused-but-set-variable) \
- $(call kernel-cc-option,-Wno-old-style-declaration) \
- $(call kernel-cc-optional-warning,-Wbad-function-cast) \
- $(call kernel-cc-optional-warning,-Wcast-qual) \
- $(call kernel-cc-optional-warning,-Wcast-align) \
- $(call kernel-cc-optional-warning,-Wconversion) \
- $(call kernel-cc-optional-warning,-Wdisabled-optimization) \
- $(call kernel-cc-optional-warning,-Wlogical-op) \
- $(call kernel-cc-optional-warning,-Wmissing-declarations) \
- $(call kernel-cc-optional-warning,-Wmissing-include-dirs) \
- $(call kernel-cc-optional-warning,-Wnested-externs) \
- $(call kernel-cc-optional-warning,-Wno-missing-field-initializers) \
- $(call kernel-cc-optional-warning,-Wold-style-definition) \
- $(call kernel-cc-optional-warning,-Woverlength-strings) \
- $(call kernel-cc-optional-warning,-Wpacked) \
- $(call kernel-cc-optional-warning,-Wpacked-bitfield-compat) \
- $(call kernel-cc-optional-warning,-Wpadded) \
- $(call kernel-cc-optional-warning,-Wredundant-decls) \
- $(call kernel-cc-optional-warning,-Wshadow) \
- $(call kernel-cc-optional-warning,-Wswitch-default) \
- $(call kernel-cc-optional-warning,-Wvla) \
- $(call kernel-cc-optional-warning,-Wwrite-strings)
+# androideabi toolchain adds `pic` by default, disable it
+# for kernel module build
 
 # User C only
 #
@@ -199,12 +175,12 @@ ALL_HOST_CFLAGS := \
 
 # User C++ only
 #
-ALL_CXXFLAGS := \
- -fno-rtti -fno-exceptions \
+#ALL_CXXFLAGS := \
+# -fno-rtti -fno-exceptions \
  $(COMMON_USER_FLAGS) $(COMMON_FLAGS) $(TESTED_TARGET_USER_FLAGS) \
  $(SYS_CXXFLAGS)
-ALL_HOST_CXXFLAGS := \
- -fno-rtti -fno-exceptions \
+#ALL_HOST_CXXFLAGS := \
+# -fno-rtti -fno-exceptions \
  $(COMMON_USER_FLAGS) $(COMMON_FLAGS) $(TESTED_HOST_USER_FLAGS)
 
 # Workaround for some target clangs that don't support -O0 w/ PIC.
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 68e8132..ba37064 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
@@ -245,8 +245,8 @@ PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_RAWxx := 1
 endif
 
 ##############################################################################
-# Marshmallow onwards DDK stopped render script accleration using GPU.
-# This flag stops device alloction.
+# Marshmallow onwards DDK stopped render script acceleration using GPU.
+# This flag stops device allocation.
 #
 ifeq ($(is_at_least_marshmallow),1)
 PVR_ANDROID_HAS_GRALLOC_USAGE_RENDERSCRIPT := 1
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 046b8bb..082cd79 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
@@ -51,10 +51,6 @@ ifeq ($(TARGET_DEVICE),)
 override TARGET_DEVICE := jacinto6evm
 endif
 
-ifeq ($(TARGET_DEVICE),)
-override TARGET_DEVICE := am57xevm
-endif
-
 # Customize this build as per the TARGET_DEVICE setting
 #
 ifneq ($(filter blaze blaze_tablet panda tuna maguro toro mysid yakju,$(TARGET_DEVICE)),)
@@ -99,8 +95,7 @@ SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
 endif
 
 ifneq ($(filter am57xevm,$(TARGET_DEVICE)),)
-HAL_VARIANT                                     := am57x
-
+HAL_VARIANT                                     := am57xevm
 endif
 
 # Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs
diff --git a/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h b/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h
index d48838f..bc0d8cc 100644
--- a/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h
+++ b/jacinto6/sgx_src/eurasia_km/include4/pvrversion.h
@@ -53,16 +53,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define PVRVERSION_FAMILY           "sgxddk"
 #define PVRVERSION_BRANCHNAME       "1.14"
-#define PVRVERSION_BUILD             4001660
-#define PVRVERSION_BSCONTROL        "SGX_DDK_Linux_XOrg"
+#define PVRVERSION_BUILD             4081762
+#define PVRVERSION_BSCONTROL        "SGX_DDK_Android"
 
-#define PVRVERSION_STRING           "SGX_DDK_Linux_XOrg sgxddk 1.14@" PVR_STR2(PVRVERSION_BUILD)
+#define PVRVERSION_STRING           "SGX_DDK_Android sgxddk 1.14@" PVR_STR2(PVRVERSION_BUILD)
 #define PVRVERSION_STRING_SHORT     "1.14@" PVR_STR2(PVRVERSION_BUILD) ""
 
 #define COPYRIGHT_TXT               "Copyright (c) Imagination Technologies Ltd. All Rights Reserved."
 
-#define PVRVERSION_BUILD_HI          400
-#define PVRVERSION_BUILD_LO          1660
+#define PVRVERSION_BUILD_HI          408
+#define PVRVERSION_BUILD_LO          1762
 #define PVRVERSION_STRING_NUMERIC    PVR_STR2(PVRVERSION_MAJ) "." PVR_STR2(PVRVERSION_MIN) "." PVR_STR2(PVRVERSION_BUILD_HI) "." PVR_STR2(PVRVERSION_BUILD_LO)
 
 #endif /* _PVRVERSION_H_ */
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c
index bce7945..6ca6bc2 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/devices/sgx/sgxutils.c
@@ -1100,6 +1100,7 @@ IMG_HANDLE SGXRegisterHWRenderContextKM(IMG_HANDLE				hDeviceNode,
     IMG_UINT8 *pDst;
 	PRESMAN_ITEM psResItem;
 	IMG_UINT32 ui32PDDevPAddrInDirListFormat;
+	IMG_UINT8 *pStartPDDevPAddr, *pEndPDDevPAddr;
 
 	eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
 						sizeof(SGX_HW_RENDER_CONTEXT_CLEANUP),
@@ -1135,6 +1136,16 @@ IMG_HANDLE SGXRegisterHWRenderContextKM(IMG_HANDLE				hDeviceNode,
 		PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWRenderContextKM: Couldn't allocate device memory for HW Render Context"));
 		goto exit1;
 	}
+	/* Ensure that the offset of Page directory dev physical address field is within the allocated context memory */
+	pStartPDDevPAddr = (IMG_UINT8 *)(psCleanup->psHWRenderContextMemInfo->pvLinAddrKM) + ui32OffsetToPDDevPAddr;
+	pEndPDDevPAddr = pStartPDDevPAddr + sizeof(ui32PDDevPAddrInDirListFormat) - 1;
+
+	if (pStartPDDevPAddr < (IMG_UINT8 *)psCleanup->psHWRenderContextMemInfo->pvLinAddrKM || 
+			pEndPDDevPAddr >= (IMG_UINT8 *)(psCleanup->psHWRenderContextMemInfo->pvLinAddrKM) + ui32HWRenderContextSize)
+	{
+		PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWRenderContextKM: Offset of page directory device physical address is invalid"));
+		goto exit2;
+	}
 
     eError = OSCopyFromUser(psPerProc,
                             psCleanup->psHWRenderContextMemInfo->pvLinAddrKM,
@@ -1287,6 +1298,7 @@ IMG_HANDLE SGXRegisterHWTransferContextKM(IMG_HANDLE				hDeviceNode,
     IMG_UINT8 *pDst;
 	PRESMAN_ITEM psResItem;
 	IMG_UINT32 ui32PDDevPAddrInDirListFormat;
+	IMG_UINT8 *pStartPDDevPAddr, *pEndPDDevPAddr;
 
 	eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
 						sizeof(SGX_HW_TRANSFER_CONTEXT_CLEANUP),
@@ -1324,6 +1336,17 @@ IMG_HANDLE SGXRegisterHWTransferContextKM(IMG_HANDLE				hDeviceNode,
 		goto exit1;
 	}
 
+	/* Ensure that the offset of Page directory dev physical address field is within the allocated context memory */
+	pStartPDDevPAddr = (IMG_UINT8 *)(psCleanup->psHWTransferContextMemInfo->pvLinAddrKM) + ui32OffsetToPDDevPAddr;
+	pEndPDDevPAddr = pStartPDDevPAddr + sizeof(ui32PDDevPAddrInDirListFormat) - 1;
+
+	if (pStartPDDevPAddr < (IMG_UINT8 *)psCleanup->psHWTransferContextMemInfo->pvLinAddrKM || 
+			pEndPDDevPAddr >= (IMG_UINT8 *)(psCleanup->psHWTransferContextMemInfo->pvLinAddrKM) + ui32HWTransferContextSize)
+	{
+		PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWTransferContextKM: Offset of page directory device physical address is invalid"));
+		goto exit2;
+	}
+
     eError = OSCopyFromUser(psPerProc,
                             psCleanup->psHWTransferContextMemInfo->pvLinAddrKM,
                             psHWTransferContextCpuVAddr,
@@ -1628,6 +1651,7 @@ IMG_HANDLE SGXRegisterHW2DContextKM(IMG_HANDLE				hDeviceNode,
     IMG_UINT8 *pDst;
 	PRESMAN_ITEM psResItem;
 	IMG_UINT32 ui32PDDevPAddrInDirListFormat;
+	IMG_UINT8 *pStartPDDevPAddr, *pEndPDDevPAddr;
 
 	eError = OSAllocMem(PVRSRV_OS_PAGEABLE_HEAP,
 						sizeof(SGX_HW_2D_CONTEXT_CLEANUP),
@@ -1664,6 +1688,17 @@ IMG_HANDLE SGXRegisterHW2DContextKM(IMG_HANDLE				hDeviceNode,
 		goto exit1;
 	}
 
+	/* Ensure that the offset of Page directory dev physical address field is within the allocated context memory */
+	pStartPDDevPAddr = (IMG_UINT8 *)(psCleanup->psHW2DContextMemInfo->pvLinAddrKM) + ui32OffsetToPDDevPAddr;
+	pEndPDDevPAddr = pStartPDDevPAddr + sizeof(ui32PDDevPAddrInDirListFormat) - 1;
+
+	if (pStartPDDevPAddr < (IMG_UINT8 *)psCleanup->psHW2DContextMemInfo->pvLinAddrKM || 
+			pEndPDDevPAddr >= (IMG_UINT8 *)(psCleanup->psHW2DContextMemInfo->pvLinAddrKM) + ui32HW2DContextSize)
+	{
+		PVR_DPF((PVR_DBG_ERROR, "SGXRegisterHWTransferContextKM: Offset of page directory device physical address is invalid"));
+		goto exit2;
+	}
+
     eError = OSCopyFromUser(psPerProc,
                             psCleanup->psHW2DContextMemInfo->pvLinAddrKM,
                             psHW2DContextCpuVAddr,
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/mmap.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/mmap.c
index e7fb667..a20f876 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/mmap.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/mmap.c
@@ -48,6 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include <linux/mm.h>
+#include <linux/pfn_t.h>
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
@@ -787,7 +788,7 @@ DoMapToUser(LinuxMemArea *psLinuxMemArea,
 #if defined(PVR_MAKE_ALL_PFNS_SPECIAL)
 		    if (bMixedMap)
 		    {
-			result = vm_insert_mixed(ps_vma, ulVMAPos, pfn);
+			result = vm_insert_mixed(ps_vma, ulVMAPos, pfn_to_pfn_t(pfn));
 	                if(result != 0)
 	                {
 	                    PVR_DPF((PVR_DBG_ERROR,"%s: Error - vm_insert_mixed failed (%d)", __FUNCTION__, result));
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/osfunc.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/osfunc.c
index 1302edb..81b9985 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/osfunc.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/osfunc.c
@@ -3547,7 +3547,7 @@ PVRSRV_ERROR OSReleasePhysPageAddr(IMG_HANDLE hOSWrapMem)
                         SetPageDirty(psPage);
                     }
 	        }
-                page_cache_release(psPage);
+                put_page(psPage);
 	    }
             break;
         }
@@ -3729,7 +3729,7 @@ PVRSRV_ERROR OSAcquirePhysPageAddr(IMG_VOID *pvCPUVAddr,
     bMMapSemHeld = IMG_TRUE;
 
     /* Get page list */
-    psInfo->iNumPagesMapped = get_user_pages(current, current->mm, uStartAddr, psInfo->iNumPages, 1, 0, psInfo->ppsPages, NULL);
+    psInfo->iNumPagesMapped = get_user_pages_remote(current, current->mm, uStartAddr, psInfo->iNumPages, FOLL_WRITE, psInfo->ppsPages, NULL);
 
     if (psInfo->iNumPagesMapped >= 0)
     {
diff --git a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_drm.c b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
index 8b862a9..5ba106c 100644
--- a/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
+++ b/jacinto6/sgx_src/eurasia_km/services4/srvkm/env/linux/pvr_drm.c
@@ -592,18 +592,6 @@ static struct drm_driver sPVRDrmDriver =
 	},
 #endif
 #endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
-#if defined(LDM_PLATFORM)
-	.set_busid = drm_platform_set_busid,
-#else
-#if defined(LDM_PCI)
-	.set_busid = drm_pci_set_busid,
-#else
-	#error "LDM_PLATFORM or LDM_PCI must be set"
-#endif
-#endif
-#endif
 	.name = "pvr",
 	.desc = PVR_DRM_DESC,
 	.date = PVR_DRM_DATE,
diff --git a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk
index e1e8868..7a827ce 100644
--- a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk
+++ b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/Kbuild.mk
@@ -43,9 +43,9 @@ ccflags-y += \
 	-I$(TOP)/tools/intern/debug/client
 
 dbgdrv-y += \
+	tools/intern/debug/dbgdriv/common/dbgdriv_handle.o \
 	tools/intern/debug/dbgdriv/common/dbgdriv.o \
 	tools/intern/debug/dbgdriv/common/ioctl.o \
-	tools/intern/debug/dbgdriv/common/handle.o \
 	tools/intern/debug/dbgdriv/common/hotkey.o \
 	tools/intern/debug/dbgdriv/linux/main.o \
 	tools/intern/debug/dbgdriv/linux/hostfunc.o
diff --git a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/handle.c b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/dbgdriv_handle.c
index a9d37a6..a9d37a6 100644
--- a/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/handle.c
+++ b/jacinto6/sgx_src/eurasia_km/tools/intern/debug/dbgdriv/common/dbgdriv_handle.c
diff --git a/jacinto6/touch-full_jacinto6evm.mk b/jacinto6/touch-full_jacinto6evm.mk
new file mode 100644
index 0000000..c1d27c0
--- /dev/null
+++ b/jacinto6/touch-full_jacinto6evm.mk
@@ -0,0 +1,24 @@
+# Copyright (C) 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Add Touchscreen- Define the tgz to be unpacked, and enable the
+# DRA71x-RevA-GT9271_SpecDig_Config.bin package, which is defined in the top-level Android.mk
+# of the proprietary-open tree
+
+ifeq ($(TARGET_PRODUCT),$(filter $(TARGET_PRODUCT),full_jacinto6evm))
+TOUCH_TGZ := device/ti/proprietary-open/jacinto6/touch_full_jacinto6evm.tgz
+TOUCH_BINARY := DRA71x-RevA-GT9271_SpecDig_Config.bin
+PRODUCT_PACKAGES += DRA71x-RevA-GT9271_SpecDig_Config.bin
+endif
diff --git a/jacinto6/touch_full_jacinto6evm.tgz b/jacinto6/touch_full_jacinto6evm.tgz
new file mode 100644
index 0000000..5cba4f0
--- /dev/null
+++ b/jacinto6/touch_full_jacinto6evm.tgz