Imported Upstream version 1.7.15.0.1.57 (ARMHF)upstream/1.7.15.0.1.57

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>

7 files changed, 16 insertions, 9 deletions

diff --git a/sgx/include4/img_defs.h b/sgx/include4/img_defs.h
index 8ca49d2..79a730f 100644
--- a/sgx/include4/img_defs.h
+++ b/sgx/include4/img_defs.h
@@ -77,7 +77,7 @@ typedef char				TCHAR, *PTCHAR, *PTSTR;
 #endif 
 
 
-			#if defined(__linux__) || defined(__METAG)
+			#if defined(__linux__) || defined(__QNXNTO__) || defined(__METAG)
 
 				#define IMG_CALLCONV
 				#define IMG_INTERNAL	__attribute__((visibility("hidden")))
diff --git a/sgx/include4/img_types.h b/sgx/include4/img_types.h
index 614f957..e502701 100644
--- a/sgx/include4/img_types.h
+++ b/sgx/include4/img_types.h
@@ -62,7 +62,7 @@ typedef unsigned __int64	IMG_UINT64, *IMG_PUINT64;
 typedef __int64				IMG_INT64,  *IMG_PINT64;
 
 #else
-	#if (defined(LINUX) || defined(__METAG))
+	#if ((defined(LINUX) || defined(__METAG)) || defined(__QNXNTO__))
 		typedef unsigned long long		IMG_UINT64,	*IMG_PUINT64;
 		typedef long long 				IMG_INT64,	*IMG_PINT64;
 	#else
diff --git a/sgx/include4/omap_v4l2_gfx.h b/sgx/include4/omap_v4l2_gfx.h
index cb175e5..cb175e5 100755..100644
--- a/sgx/include4/omap_v4l2_gfx.h
+++ b/sgx/include4/omap_v4l2_gfx.h
diff --git a/sgx/include4/pvrversion.h b/sgx/include4/pvrversion.h
index 4358faa..f731b68 100755..100644
--- a/sgx/include4/pvrversion.h
+++ b/sgx/include4/pvrversion.h
@@ -40,9 +40,9 @@
 #define PVR_STR(X) #X
 #define PVR_STR2(X) PVR_STR(X)
 
-#define OMAPVERSION_PVR_RLS 10
+#define OMAPVERSION_PVR_RLS 15
 #define OMAPVERSION_OMAP_RLS 0
-#define OMAPVERSION_STRING "1.7.10.0"
+#define OMAPVERSION_STRING "1.7.15.0"
 
 #define PVRVERSION_MAJ               1
 #define PVRVERSION_MIN               7
@@ -50,7 +50,7 @@
 
 #define PVRVERSION_FAMILY           "sgxddk"
 #define PVRVERSION_BRANCHNAME       "1.7"
-#define PVRVERSION_BUILD             296543
+#define PVRVERSION_BUILD             840390
 #define PVRVERSION_BSCONTROL        "CustomerTI_OMAP4430_Linux_GPL"
 
 #define PVRVERSION_STRING           "CustomerTI_OMAP4430_Linux_GPL sgxddk 17 1.7@" PVR_STR2(PVRVERSION_BUILD)
@@ -58,8 +58,8 @@
 
 #define COPYRIGHT_TXT               "Copyright (c) Imagination Technologies Ltd. All Rights Reserved."
 
-#define PVRVERSION_BUILD_HI          29
-#define PVRVERSION_BUILD_LO          6543
+#define PVRVERSION_BUILD_HI          84
+#define PVRVERSION_BUILD_LO          390
 #define PVRVERSION_STRING_NUMERIC    PVR_STR2(PVRVERSION_MAJ) "." PVR_STR2(PVRVERSION_MIN) "." PVR_STR2(PVRVERSION_BUILD_HI) "." PVR_STR2(PVRVERSION_BUILD_LO)
 
 #endif 
diff --git a/sgx/include4/services.h b/sgx/include4/services.h
index 92826b0..3a53b29 100644
--- a/sgx/include4/services.h
+++ b/sgx/include4/services.h
@@ -1153,7 +1153,7 @@ static INLINE IMG_VOID PVRSRVPostSemaphore(PVRSRV_SEMAPHORE_HANDLE hSemaphore, I
 #endif 
 
 
-#if (defined(DEBUG) && defined(__linux__))
+#if (defined(DEBUG) && (defined(__linux__) || defined(__QNXNTO__)))
 IMG_IMPORT IMG_PVOID IMG_CALLCONV PVRSRVAllocUserModeMemTracking(IMG_SIZE_T ui32Size, IMG_CHAR *pszFileName, IMG_UINT32 ui32LineNumber);
 
 IMG_IMPORT IMG_PVOID IMG_CALLCONV PVRSRVCallocUserModeMemTracking(IMG_SIZE_T ui32Size, IMG_CHAR *pszFileName, IMG_UINT32 ui32LineNumber);
@@ -1253,6 +1253,11 @@ IMG_IMPORT
 const IMG_CHAR *PVRSRVGetErrorString(PVRSRV_ERROR eError);
 
 
+IMG_IMPORT
+PVRSRV_ERROR IMG_CALLCONV PVRSRVCacheInvalidate(const PVRSRV_CONNECTION *psConnection,
+                                                IMG_PVOID pvLinearAddress,
+	                                            IMG_UINT32 ui32Size);
+
 #define TIME_NOT_PASSED_UINT32(a,b,c)		(((a) - (b)) < (c))
 
 #if defined (__cplusplus)
diff --git a/sgx/include4/servicesext.h b/sgx/include4/servicesext.h
index 2731db5..54dd4d9 100644
--- a/sgx/include4/servicesext.h
+++ b/sgx/include4/servicesext.h
@@ -260,6 +260,8 @@ typedef enum _PVRSRV_ERROR_
 
 	PVRSRV_ERROR_CACHEOP_FAILED,
 
+	PVRSRV_ERROR_CACHE_INVALIDATE_FAILED,
+
 	PVRSRV_ERROR_FORCE_I32 = 0x7fffffff
 
 } PVRSRV_ERROR;
diff --git a/sgx/include4/sgxapi_km.h b/sgx/include4/sgxapi_km.h
index a0d8e5b..dcbafbf 100644
--- a/sgx/include4/sgxapi_km.h
+++ b/sgx/include4/sgxapi_km.h
@@ -33,7 +33,7 @@ extern "C" {
 
 #include "sgxdefs.h"
 
-#if defined(__linux__) && !defined(USE_CODE)
+#if (defined(__linux__) || defined(__QNXNTO__)) && !defined(USE_CODE)
 	#if defined(__KERNEL__)
 		#include <asm/unistd.h>
 	#else