Imported Upstream version 1.9.0.4.1.1 (ARMHF)upstream/1.9.0.4.1.1

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

1 files changed, 193 insertions, 79 deletions

diff --git a/sgx/services4/include/sgx_bridge.h b/sgx/services4/include/sgx_bridge.h
index ec630a5..7f35fc1 100644
--- a/sgx/services4/include/sgx_bridge.h
+++ b/sgx/services4/include/sgx_bridge.h
@@ -1,28 +1,45 @@
-/**********************************************************************
- *
- * Copyright (C) Imagination Technologies Ltd. All rights reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope it will be useful but, except 
- * as otherwise stated in writing, without any warranty; without even the 
- * implied warranty of merchantability or fitness for a particular purpose. 
- * See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- * 
- * The full GNU General Public License is included in this distribution in
- * the file called "COPYING".
- *
- * Contact Information:
- * Imagination Technologies Ltd. <gpl-support@imgtec.com>
- * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK 
- *
- ******************************************************************************/
+/*************************************************************************/ /*!
+@Title          SGX Bridge Functionality
+@Copyright      Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+@Description    Header for the sgx Brdige code
+@License        Dual MIT/GPLv2
+
+The contents of this file are subject to the MIT license as set out below.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+Alternatively, the contents of this file may be used under the terms of
+the GNU General Public License Version 2 ("GPL") in which case the provisions
+of GPL are applicable instead of those above.
+
+If you wish to allow use of your version of this file only under the terms of
+GPL, and not to allow others to use your version of this file under the terms
+of the MIT license, indicate your decision by deleting the provisions above
+and replace them with the notice and other provisions required by GPL as set
+out in the file called "GPL-COPYING" included in this distribution. If you do
+not delete the provisions above, a recipient may use your version of this file
+under the terms of either the MIT license or GPL.
+
+This License is also included in this distribution in the file called
+"MIT-COPYING".
+
+EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
+PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+*/ /**************************************************************************/
 
 #if !defined(__SGX_BRIDGE_H__)
 #define __SGX_BRIDGE_H__
@@ -40,6 +57,14 @@ extern "C" {
 #endif
 
 
+/* 
+ * Bridge Cmd Ids
+ */
+
+/* *REMEMBER* to update PVRSRV_BRIDGE_LAST_SGX_CMD if you add/remove a command! 
+ * Also you need to ensure all PVRSRV_BRIDGE_SGX_CMD_BASE+ offsets are sequential!
+ */
+
 #define PVRSRV_BRIDGE_SGX_CMD_BASE (PVRSRV_BRIDGE_LAST_NON_DEVICE_CMD+1)
 #define PVRSRV_BRIDGE_SGX_GETCLIENTINFO			PVRSRV_IOWR(PVRSRV_BRIDGE_SGX_CMD_BASE+0)
 #define PVRSRV_BRIDGE_SGX_RELEASECLIENTINFO		PVRSRV_IOWR(PVRSRV_BRIDGE_SGX_CMD_BASE+1)
@@ -88,17 +113,30 @@ extern "C" {
 
 
 
+/* *REMEMBER* to update PVRSRV_BRIDGE_LAST_SGX_CMD if you add/remove a command! 
+ * You need to ensure all PVRSRV_BRIDGE_SGX_CMD_BASE+ offsets are sequential!
+ */
 #define PVRSRV_BRIDGE_LAST_SGX_CMD (PVRSRV_BRIDGE_SGX_CMD_BASE+37)
 
- 
+/*****************************************************************************
+ * Input structures for IOCTL/DRVESC 
+ *****************************************************************************/
+
+/*!
+ *****************************************************************************
+ *	`bridge in' SGX Get Phys Page Addr
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_GETPHYSPAGEADDR
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 	IMG_HANDLE hDevMemHeap;
 	IMG_DEV_VIRTADDR sDevVAddr;
 }PVRSRV_BRIDGE_IN_GETPHYSPAGEADDR;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge out' SGX Get Phys Page Addr
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_OUT_GETPHYSPAGEADDR
 {
 	PVRSRV_ERROR		eError;
@@ -106,10 +144,13 @@ typedef struct PVRSRV_BRIDGE_OUT_GETPHYSPAGEADDR
 	IMG_CPU_PHYADDR		CpuPAddr;
 }PVRSRV_BRIDGE_OUT_GETPHYSPAGEADDR;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' set transfer context priority
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_SGX_SET_TRANSFER_CONTEXT_PRIORITY_TAG
  {
- 	IMG_UINT32				ui32BridgeFlags; 
+ 	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
  #if defined (SUPPORT_SID_INTERFACE)
  	IMG_SID					hDevCookie;
 	IMG_SID					hHWTransferContext;
@@ -121,10 +162,13 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_SET_TRANSFER_CONTEXT_PRIORITY_TAG
     IMG_UINT32              ui32OffsetOfPriorityField;
 }PVRSRV_BRIDGE_IN_SGX_SET_TRANSFER_CONTEXT_PRIORITY;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' set render context priority
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_SGX_SET_RENDER_CONTEXT_PRIORITY_TAG
 {
-	IMG_UINT32				ui32BridgeFlags; 
+	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID					hDevCookie;
 	IMG_SID					hHWRenderContext;
@@ -136,10 +180,13 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_SET_RENDER_CONTEXT_PRIORITY_TAG
     IMG_UINT32              ui32OffsetOfPriorityField;
 }PVRSRV_BRIDGE_IN_SGX_SET_RENDER_CONTEXT_PRIORITY;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' Get Client Info
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_GETCLIENTINFO_TAG
 {
-	IMG_UINT32					ui32BridgeFlags; 
+	IMG_UINT32					ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID						hDevCookie;
 #else
@@ -147,17 +194,23 @@ typedef struct PVRSRV_BRIDGE_IN_GETCLIENTINFO_TAG
 #endif
 }PVRSRV_BRIDGE_IN_GETCLIENTINFO;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge out' Get internal device info
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_OUT_GETINTERNALDEVINFO_TAG
 {
 	SGX_INTERNAL_DEVINFO	sSGXInternalDevInfo;
 	PVRSRV_ERROR				eError;
 }PVRSRV_BRIDGE_OUT_GETINTERNALDEVINFO;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' Get internal device info
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_GETINTERNALDEVINFO_TAG
 {
-	IMG_UINT32				ui32BridgeFlags; 
+	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID					hDevCookie;
 #else
@@ -165,17 +218,23 @@ typedef struct PVRSRV_BRIDGE_IN_GETINTERNALDEVINFO_TAG
 #endif
 }PVRSRV_BRIDGE_IN_GETINTERNALDEVINFO;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge out' Get Client Info
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_OUT_GETCLIENTINFO_TAG
 {
 	SGX_CLIENT_INFO  	sClientInfo;
 	PVRSRV_ERROR			eError;
 }PVRSRV_BRIDGE_OUT_GETCLIENTINFO;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' Release Client Info
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_RELEASECLIENTINFO_TAG
 {
-	IMG_UINT32			ui32BridgeFlags; 
+	IMG_UINT32			ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID				hDevCookie;
 #else
@@ -184,10 +243,13 @@ typedef struct PVRSRV_BRIDGE_IN_RELEASECLIENTINFO_TAG
 	SGX_CLIENT_INFO  	sClientInfo;
 }PVRSRV_BRIDGE_IN_RELEASECLIENTINFO;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' Pdump ISP mem Pol
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_ISPBREAKPOLL_TAG
 {
-	IMG_UINT32				ui32BridgeFlags; 
+	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID					hDevCookie;
 #else
@@ -195,10 +257,13 @@ typedef struct PVRSRV_BRIDGE_IN_ISPBREAKPOLL_TAG
 #endif
 }PVRSRV_BRIDGE_IN_ISPBREAKPOLL;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' KickTA
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_DOKICK_TAG
 {
-	IMG_UINT32				ui32BridgeFlags; 
+	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID					hDevCookie;
 #else
@@ -207,10 +272,13 @@ typedef struct PVRSRV_BRIDGE_IN_DOKICK_TAG
 	SGX_CCB_KICK			sCCBKick;
 }PVRSRV_BRIDGE_IN_DOKICK;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' SGXScheduleProcessQueues
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_SGX_SCHEDULE_PROCESS_QUEUES_TAG
 {
-	IMG_UINT32				ui32BridgeFlags; 
+	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID					hDevCookie;
 #else
@@ -220,10 +288,13 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_SCHEDULE_PROCESS_QUEUES_TAG
 
 
 #if defined(TRANSFER_QUEUE)
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' SubmitTransfer
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_SUBMITTRANSFER_TAG
 {
-	IMG_UINT32				ui32BridgeFlags; 
+	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID					hDevCookie;
 #else
@@ -233,10 +304,13 @@ typedef struct PVRSRV_BRIDGE_IN_SUBMITTRANSFER_TAG
 }PVRSRV_BRIDGE_IN_SUBMITTRANSFER;
 
 #if defined(SGX_FEATURE_2D_HARDWARE)
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' Submit2D
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_SUBMIT2D_TAG
 {
-	IMG_UINT32				ui32BridgeFlags; 
+	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID					hDevCookie;
 #else
@@ -247,10 +321,13 @@ typedef struct PVRSRV_BRIDGE_IN_SUBMIT2D_TAG
 #endif
 #endif
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' ReadRegistryString
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_READREGDWORD_TAG
 {
-	IMG_UINT32				ui32BridgeFlags; 
+	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID					hDevCookie;
 #else
@@ -260,7 +337,10 @@ typedef struct PVRSRV_BRIDGE_IN_READREGDWORD_TAG
     IMG_PCHAR				pszValue;
 }PVRSRV_BRIDGE_IN_READREGDWORD;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge out' ReadRegistryString
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_OUT_READREGDWORD_TAG
 {
 	PVRSRV_ERROR	eError;
@@ -268,9 +348,13 @@ typedef struct PVRSRV_BRIDGE_OUT_READREGDWORD_TAG
 }PVRSRV_BRIDGE_OUT_READREGDWORD;
 
 
+/*!
+ *****************************************************************************
+ *	`bridge in' SGXGetMiscInfo
+ *****************************************************************************/
 typedef struct PVRSRV_BRIDGE_IN_SGXGETMISCINFO_TAG
 {
-	IMG_UINT32		ui32BridgeFlags; 
+	IMG_UINT32		ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID			hDevCookie;
 #else
@@ -279,9 +363,13 @@ typedef struct PVRSRV_BRIDGE_IN_SGXGETMISCINFO_TAG
 	SGX_MISC_INFO	*psMiscInfo;
 }PVRSRV_BRIDGE_IN_SGXGETMISCINFO;
 
+/*!
+ *****************************************************************************
+ *	`bridge in' SGXGetInfoForSrvInit
+ *****************************************************************************/
 typedef struct PVRSRV_BRIDGE_IN_SGXINFO_FOR_SRVINIT_TAG
 {
-	IMG_UINT32		ui32BridgeFlags; 
+	IMG_UINT32		ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID			hDevCookie;
 #else
@@ -289,15 +377,23 @@ typedef struct PVRSRV_BRIDGE_IN_SGXINFO_FOR_SRVINIT_TAG
 #endif
 }PVRSRV_BRIDGE_IN_SGXINFO_FOR_SRVINIT;
 
+/*!
+ *****************************************************************************
+ *	`bridge out' SGXGetInfoForSrvInit
+ *****************************************************************************/
 typedef struct PVRSRV_BRIDGE_OUT_SGXINFO_FOR_SRVINIT_TAG
 {
 	PVRSRV_ERROR			eError;
 	SGX_BRIDGE_INFO_FOR_SRVINIT	sInitInfo;
 }PVRSRV_BRIDGE_OUT_SGXINFO_FOR_SRVINIT;
 
+/*!
+ *****************************************************************************
+ *	`bridge in' SGXDevInitPart2
+ *****************************************************************************/
 typedef struct PVRSRV_BRIDGE_IN_SGXDEVINITPART2_TAG
 {
-	IMG_UINT32		ui32BridgeFlags; 
+	IMG_UINT32		ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID			hDevCookie;
 #else
@@ -306,6 +402,10 @@ typedef struct PVRSRV_BRIDGE_IN_SGXDEVINITPART2_TAG
 	SGX_BRIDGE_INIT_INFO	sInitInfo;
 }PVRSRV_BRIDGE_IN_SGXDEVINITPART2;
 
+/*!
+ *****************************************************************************
+ *	`bridge out' SGXDevInitPart2
+ *****************************************************************************/
 typedef struct PVRSRV_BRIDGE_OUT_SGXDEVINITPART2_TAG
 {
 	PVRSRV_ERROR 	eError;
@@ -313,10 +413,13 @@ typedef struct PVRSRV_BRIDGE_OUT_SGXDEVINITPART2_TAG
 
 }PVRSRV_BRIDGE_OUT_SGXDEVINITPART2;
 
- 
+/*!
+ *****************************************************************************
+ *	`bridge in' 2D query blits complete
+ *****************************************************************************/ 
 typedef struct PVRSRV_BRIDGE_IN_2DQUERYBLTSCOMPLETE_TAG
 {
-	IMG_UINT32				ui32BridgeFlags; 
+	IMG_UINT32				ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID					hDevCookie;
 	IMG_SID					hKernSyncInfo;
@@ -332,7 +435,7 @@ typedef struct PVRSRV_BRIDGE_IN_2DQUERYBLTSCOMPLETE_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_SGXFINDSHAREDPBDESC_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
 #else
@@ -367,7 +470,7 @@ typedef struct PVRSRV_BRIDGE_OUT_SGXFINDSHAREDPBDESC_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_SGXUNREFSHAREDPBDESC_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hSharedPBDesc;
 #else
@@ -383,7 +486,7 @@ typedef struct PVRSRV_BRIDGE_OUT_SGXUNREFSHAREDPBDESC_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_SGXADDSHAREDPBDESC_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 	IMG_UINT32 ui32TotalPBSize;
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
@@ -418,7 +521,7 @@ typedef struct PVRSRV_BRIDGE_OUT_SGXADDSHAREDPBDESC_TAG
 #ifdef	PDUMP
 typedef struct PVRSRV_BRIDGE_IN_PDUMP_BUFFER_ARRAY_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 	SGX_KICKTA_DUMP_BUFFER *psBufferArray;
 	IMG_UINT32 ui32BufferArrayLength;
 	IMG_BOOL bDumpPolls;
@@ -426,7 +529,7 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_BUFFER_ARRAY_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_PDUMP_3D_SIGNATURE_REGISTERS_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
 	IMG_SID    hDevMemContext;
@@ -442,7 +545,7 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_3D_SIGNATURE_REGISTERS_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_PDUMPCOUNTER_REGISTERS_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
 #else
@@ -456,7 +559,7 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMPCOUNTER_REGISTERS_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_PDUMP_TA_SIGNATURE_REGISTERS_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
 #else
@@ -471,7 +574,7 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_TA_SIGNATURE_REGISTERS_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_PDUMP_HWPERFCB_TAG
 {
-	IMG_UINT32			ui32BridgeFlags; 
+	IMG_UINT32			ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID				hDevCookie;
 	IMG_SID				hDevMemContext;
@@ -487,7 +590,7 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_HWPERFCB_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_PDUMP_SAVEMEM
 {
-	IMG_UINT32			ui32BridgeFlags; 
+	IMG_UINT32			ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID				hDevCookie;
 	IMG_SID				hDevMemContext;
@@ -509,7 +612,7 @@ typedef struct PVRSRV_BRIDGE_IN_PDUMP_SAVEMEM
 
 typedef struct PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_RENDER_CONTEXT_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
 #else
@@ -534,7 +637,7 @@ typedef struct PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_RENDER_CONTEXT_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_RENDER_CONTEXT_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 	IMG_BOOL   bForceCleanup;
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
@@ -547,7 +650,7 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_RENDER_CONTEXT_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_TRANSFER_CONTEXT_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
 #else
@@ -572,7 +675,7 @@ typedef struct PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_TRANSFER_CONTEXT_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_TRANSFER_CONTEXT_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 	IMG_BOOL   bForceCleanup;
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
@@ -585,7 +688,7 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_TRANSFER_CONTEXT_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_SGX_FLUSH_HW_RENDER_TARGET_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
 #else
@@ -594,11 +697,14 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_FLUSH_HW_RENDER_TARGET_TAG
 	IMG_DEV_VIRTADDR sHWRTDataSetDevVAddr;
 }PVRSRV_BRIDGE_IN_SGX_FLUSH_HW_RENDER_TARGET;
 
- 
+/*!
+ *****************************************************************************
+ *	SGX 2D specific defines
+ *****************************************************************************/ 
 #if defined(SGX_FEATURE_2D_HARDWARE)
 typedef struct PVRSRV_BRIDGE_IN_SGX_REGISTER_HW_2D_CONTEXT_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
 #else
@@ -623,7 +729,7 @@ typedef struct PVRSRV_BRIDGE_OUT_SGX_REGISTER_HW_2D_CONTEXT_TAG
 
 typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_2D_CONTEXT_TAG
 {
-	IMG_UINT32 ui32BridgeFlags; 
+	IMG_UINT32 ui32BridgeFlags; /* Must be first member of structure */
 	IMG_BOOL   bForceCleanup;
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID    hDevCookie;
@@ -634,13 +740,17 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_2D_CONTEXT_TAG
 #endif
 }PVRSRV_BRIDGE_IN_SGX_UNREGISTER_HW_2D_CONTEXT;
 
-#define	SGX2D_MAX_BLT_CMD_SIZ		256	
-#endif 
+#define	SGX2D_MAX_BLT_CMD_SIZ		256	/* Maximum size of a blit command, in bytes */
+#endif /* SGX_FEATURE_2D_HARDWARE */
 
 
+/*!
+ *****************************************************************************
+ *	`bridge in' SGXReadHWPerfCB
+ *****************************************************************************/
 typedef struct PVRSRV_BRIDGE_IN_SGX_READ_HWPERF_CB_TAG
 {
-	IMG_UINT32					ui32BridgeFlags; 
+	IMG_UINT32					ui32BridgeFlags; /* Must be first member of structure */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID						hDevCookie;
 #else
@@ -650,6 +760,10 @@ typedef struct PVRSRV_BRIDGE_IN_SGX_READ_HWPERF_CB_TAG
 	PVRSRV_SGX_HWPERF_CB_ENTRY	*psHWPerfCBData;
 } PVRSRV_BRIDGE_IN_SGX_READ_HWPERF_CB;
 
+/*!
+ *****************************************************************************
+ *	`bridge out' SGXReadHWPerfCB
+ *****************************************************************************/
 typedef struct PVRSRV_BRIDGE_OUT_SGX_READ_HWPERF_CB_TAG
 {
 	PVRSRV_ERROR		eError;
@@ -662,5 +776,5 @@ typedef struct PVRSRV_BRIDGE_OUT_SGX_READ_HWPERF_CB_TAG
 }
 #endif
 
-#endif 
+#endif /* __SGX_BRIDGE_H__ */