IKXCLOCK-1501 Upgrade to TI SGX Android OpenGL 1.12@2701748

  Initial codes of TI SGX DDK 1.12@2701748

Change-Id: I75a8f6521968346ea1b2ea9fa54817ba186442ce

13 files changed, 7 insertions, 8 deletions

diff --git a/drivers/gpu/pvr/tools/intern/debug/client/linuxsrv.h b/drivers/gpu/pvr/tools/intern/debug/client/linuxsrv.h
index d9fd825326e..d9fd825326e 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/client/linuxsrv.h
+++ b/drivers/gpu/pvr/tools/intern/debug/client/linuxsrv.h
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/Kbuild.mk b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/Kbuild.mk
index e1e8868f8c0..e1e8868f8c0 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/Kbuild.mk
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/Kbuild.mk
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/Linux.mk b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/Linux.mk
index e0508796b02..e0508796b02 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/Linux.mk
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/Linux.mk
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv.c b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv.c
index 0b8d445ca00..848367ad6d0 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv.c
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv.c
@@ -934,7 +934,7 @@ static IMG_UINT32 WriteExpandingBuffer(PDBG_STREAM psStream,IMG_UINT8 * pui8InBu
 	*/
 	if ((psStream->psCtrl->ui32OutMode & DEBUG_OUTMODE_STREAMENABLE) == 0)
 	{
-		PVR_DPF((PVR_DBG_ERROR, "WriteExpandingBuffer: buffer %x is disabled", (IMG_UINTPTR_T) psStream));
+		PVR_DPF((PVR_DBG_ERROR, "WriteExpandingBuffer: buffer %p is disabled", psStream));
 		return(0);
 	}
 
@@ -949,7 +949,7 @@ static IMG_UINT32 WriteExpandingBuffer(PDBG_STREAM psStream,IMG_UINT8 * pui8InBu
 		*/
 		if (ui32Space < 32)
 		{
-			PVR_DPF((PVR_DBG_ERROR, "WriteExpandingBuffer: buffer %x is full and isn't expandable", (IMG_UINTPTR_T) psStream));
+			PVR_DPF((PVR_DBG_ERROR, "WriteExpandingBuffer: buffer %p is full and isn't expandable", psStream));
 			return(0);
 		}
 	}
@@ -986,7 +986,7 @@ static IMG_UINT32 WriteExpandingBuffer(PDBG_STREAM psStream,IMG_UINT8 * pui8InBu
 					else
 					{
 						/* out of memory */
-						PVR_DPF((PVR_DBG_ERROR, "WriteExpandingBuffer: Unable to expand %x. Out of memory.", (IMG_UINTPTR_T) psStream));
+						PVR_DPF((PVR_DBG_ERROR, "WriteExpandingBuffer: Unable to expand %p. Out of memory.", psStream));
 						InvalidateAllStreams();
 						return (0xFFFFFFFFUL);
 					}
@@ -1815,13 +1815,13 @@ IMG_UINT32 IMG_CALLCONV DBGDrivWrite(PDBG_STREAM psMainStream,IMG_UINT8 * pui8In
 	*/
 	if ((psStream->psCtrl->ui32OutMode & DEBUG_OUTMODE_STREAMENABLE) == 0)
 	{
-		PVR_DPF((PVR_DBG_ERROR, "DBGDrivWrite: buffer %x is disabled", (IMG_UINTPTR_T) psStream));
+		PVR_DPF((PVR_DBG_ERROR, "DBGDrivWrite: buffer %p is disabled", psStream));
 		return(0);
 	}
 
 	if (ui32Space < 8)
 	{
-		PVR_DPF((PVR_DBG_ERROR, "DBGDrivWrite: buffer %x is full", (IMG_UINTPTR_T) psStream));
+		PVR_DPF((PVR_DBG_ERROR, "DBGDrivWrite: buffer %p is full", psStream));
 		return(0);
 	}
 
@@ -2002,7 +2002,7 @@ IMG_UINT32 IMG_CALLCONV DBGDrivRead(PDBG_STREAM psMainStream, IMG_BOOL bReadInit
 	*/
 	if (!StreamValidForRead(psMainStream))
 	{
-		PVR_DPF((PVR_DBG_ERROR, "DBGDrivRead: buffer %x is invalid", (IMG_UINTPTR_T) psMainStream));
+		PVR_DPF((PVR_DBG_ERROR, "DBGDrivRead: buffer %p is invalid", psMainStream));
 		return(0);
 	}
 
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv.h b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv.h
index d58c62d0c6a..e56d88112b0 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv.h
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv.h
@@ -51,7 +51,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define MAX_PROCESSES 		2
 #define BLOCK_USED			0x01
 #define BLOCK_LOCKED		0x02
-#define DBGDRIV_MONOBASE	0x000B0000
+#define DBGDRIV_MONOBASE	0x000B0000UL
 
 
 extern IMG_VOID *	g_pvAPIMutex;
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv_ioctl.h b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv_ioctl.h
index 0909e6de6f3..0909e6de6f3 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv_ioctl.h
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/dbgdriv_ioctl.h
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/handle.c b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/handle.c
index a9d37a6cf0f..a9d37a6cf0f 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/handle.c
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/handle.c
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hostfunc.h b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hostfunc.h
index e92ad9a1f01..e92ad9a1f01 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hostfunc.h
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hostfunc.h
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hotkey.c b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hotkey.c
index 6bf20a6c307..6bf20a6c307 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hotkey.c
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hotkey.c
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hotkey.h b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hotkey.h
index 7aa29525753..7aa29525753 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hotkey.h
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/hotkey.h
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/ioctl.c b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/ioctl.c
index 1767a9b2a19..1767a9b2a19 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/ioctl.c
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/common/ioctl.c
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c
index 5d5e9ef1a48..5d5e9ef1a48 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/linux/hostfunc.c
diff --git a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/linux/main.c b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/linux/main.c
index c1ca85b6333..b35cac40217 100644..100755
--- a/drivers/gpu/pvr/tools/intern/debug/dbgdriv/linux/main.c
+++ b/drivers/gpu/pvr/tools/intern/debug/dbgdriv/linux/main.c
@@ -61,7 +61,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #if defined(SUPPORT_DRI_DRM)
 #include "drmP.h"
-#include "drm.h"
 #endif
 
 #include "img_types.h"