gpu: pvr: Update to DDK 1.8.18.684 Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com>

4 files changed, 42 insertions, 17 deletions

diff --git a/drivers/gpu/pvr/dbgdrv/linuxsrv.h b/drivers/gpu/pvr/dbgdrv/linuxsrv.h
index ae08ebe..0b9e677 100644
--- a/drivers/gpu/pvr/dbgdrv/linuxsrv.h
+++ b/drivers/gpu/pvr/dbgdrv/linuxsrv.h
@@ -29,12 +29,12 @@
 
 typedef struct tagIOCTL_PACKAGE
 {
-	IMG_UINT32 ui32Cmd;              
-	IMG_UINT32 ui32Size;			   
-	IMG_VOID 	*pInBuffer;          
-	IMG_UINT32  ui32InBufferSize;     
-	IMG_VOID    *pOutBuffer;         
-	IMG_UINT32  ui32OutBufferSize;    
+	IMG_UINT32 ui32Cmd;              // ioctl command
+	IMG_UINT32 ui32Size;			   // needs to be correctly set
+	IMG_VOID 	*pInBuffer;          // input data buffer
+	IMG_UINT32  ui32InBufferSize;     // size of input data buffer
+	IMG_VOID    *pOutBuffer;         // output data buffer
+	IMG_UINT32  ui32OutBufferSize;    // size of output data buffer
 } IOCTL_PACKAGE;
 
 IMG_UINT32 DeviceIoControl(IMG_UINT32 hDevice,		
@@ -45,4 +45,4 @@ IMG_UINT32 DeviceIoControl(IMG_UINT32 hDevice,
 						IMG_UINT32 ui32OutBufferSize,  
 						IMG_UINT32 *pui32BytesReturned); 
 
-#endif 
+#endif /* _LINUXSRV_H__*/
diff --git a/drivers/gpu/pvr/pvr_debug.h b/drivers/gpu/pvr/pvr_debug.h
index e07103f..2b7773b 100644
--- a/drivers/gpu/pvr/pvr_debug.h
+++ b/drivers/gpu/pvr/pvr_debug.h
@@ -37,6 +37,7 @@ extern "C" {
 
 #define PVR_MAX_DEBUG_MESSAGE_LEN	(512)
 
+/* These are privately used by pvr_debug, use the PVR_DBG_ defines instead */
 #define DBGPRIV_FATAL		0x01UL
 #define DBGPRIV_ERROR		0x02UL
 #define DBGPRIV_WARNING		0x04UL
@@ -59,6 +60,9 @@ extern "C" {
 #define PVR_DBG_CALLTRACE	DBGPRIV_CALLTRACE,__FILE__, __LINE__
 #define PVR_DBG_ALLOC		DBGPRIV_ALLOC,__FILE__, __LINE__
 
+/*
+ *	Debug driver debugging
+ */
 #define PVR_DBGDRIV_MESSAGE		DBGPRIV_DBGDRV_MESSAGE, "", 0
 
 #if !defined(PVRSRV_NEED_PVR_ASSERT) && defined(DEBUG)
@@ -74,6 +78,8 @@ extern "C" {
 #endif
 
 
+/* PVR_ASSERT() and PVR_DBG_BREAK handling */
+
 #if defined(PVRSRV_NEED_PVR_ASSERT)
 
 	#define PVR_ASSERT(EXPR) if (!(EXPR)) PVRSRVDebugAssertFail(__FILE__, __LINE__);
@@ -87,13 +93,15 @@ IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVDebugAssertFail(const IMG_CHAR *pszFile,
 				#define PVR_DBG_BREAK
 			#endif
 
-#else  
+#else  /* defined(PVRSRV_NEED_PVR_ASSERT) */
 
 	#define PVR_ASSERT(EXPR)
 	#define PVR_DBG_BREAK
 
-#endif 
+#endif /* defined(PVRSRV_NEED_PVR_ASSERT) */
+
 
+/* PVR_DPF() handling */
 
 #if defined(PVRSRV_NEED_PVR_DPF)
 
@@ -105,13 +113,15 @@ IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVDebugPrintf(IMG_UINT32 ui32DebugLevel,
 												   const IMG_CHAR *pszFormat,
 												   ...) IMG_FORMAT_PRINTF(4, 5);
 
-#else  
+#else  /* defined(PVRSRV_NEED_PVR_DPF) */
 
 	#define PVR_DPF(X)
 
-#endif 
+#endif /* defined(PVRSRV_NEED_PVR_DPF) */
 
 
+/* PVR_TRACE() handling */
+
 #if defined(PVRSRV_NEED_PVR_TRACE)
 
 	#define PVR_TRACE(X)	PVRSRVTrace X
@@ -119,16 +129,20 @@ IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVDebugPrintf(IMG_UINT32 ui32DebugLevel,
 IMG_IMPORT IMG_VOID IMG_CALLCONV PVRSRVTrace(const IMG_CHAR* pszFormat, ... )
 	IMG_FORMAT_PRINTF(1, 2);
 
-#else 
+#else /* defined(PVRSRV_NEED_PVR_TRACE) */
 
 	#define PVR_TRACE(X)
 
-#endif 
+#endif /* defined(PVRSRV_NEED_PVR_TRACE) */
 
 
 #if defined (__cplusplus)
 }
 #endif
 
-#endif	
+#endif	/* __PVR_DEBUG_H__ */
+
+/******************************************************************************
+ End of file (pvr_debug.h)
+******************************************************************************/
 
diff --git a/drivers/gpu/pvr/pvrversion.h b/drivers/gpu/pvr/pvrversion.h
index 0eabdf8..c2dbe6c 100644
--- a/drivers/gpu/pvr/pvrversion.h
+++ b/drivers/gpu/pvr/pvrversion.h
@@ -23,15 +23,14 @@
  * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK 
  *
  ******************************************************************************/
-
 #ifndef _PVRVERSION_H_
 #define _PVRVERSION_H_
 
 #define PVRVERSION_MAJ 1
 #define PVRVERSION_MIN 8
 #define PVRVERSION_BRANCH 18
-#define PVRVERSION_BUILD 661
-#define PVRVERSION_STRING "1.8.18.661"
+#define PVRVERSION_BUILD 684
+#define PVRVERSION_STRING "1.8.18.684"
 #define PVRVERSION_FILE "eurasiacon.pj"
 
 #endif 
diff --git a/drivers/gpu/pvr/sgxerrata.h b/drivers/gpu/pvr/sgxerrata.h
index 12bc261..2d036b8 100644
--- a/drivers/gpu/pvr/sgxerrata.h
+++ b/drivers/gpu/pvr/sgxerrata.h
@@ -454,6 +454,16 @@
  			#define FIX_HW_BRN_31425
  		#endif
 	#else
+	#if SGX_CORE_REV == 114
+ 		#if defined(SGX_FEATURE_MP)
+ 			#define FIX_HW_BRN_31425
+ 		#endif
+	#else
+	#if SGX_CORE_REV == 115
+ 		#if defined(SGX_FEATURE_MP)
+ 			#define FIX_HW_BRN_31425
+ 		#endif
+	#else
 	#if SGX_CORE_REV == SGX_CORE_REV_HEAD
 		
 	#else
@@ -466,6 +476,8 @@
 	#endif
 	#endif
 	#endif
+	#endif
+	#endif
 	
 	#define SGX_CORE_DEFINED
 #endif