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, 80 insertions, 56 deletions

diff --git a/sgx/services4/include/sgxinfo.h b/sgx/services4/include/sgxinfo.h
index c32dc31..7340265 100644
--- a/sgx/services4/include/sgxinfo.h
+++ b/sgx/services4/include/sgxinfo.h
@@ -1,29 +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 services structures/functions
+@Copyright      Copyright (c) Imagination Technologies Ltd. All Rights Reserved
+@Description    inline functions/structures shared across UM and KM services components
+@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 (__SGXINFO_H__)
 #define __SGXINFO_H__
 
@@ -135,7 +151,7 @@ typedef struct _SGX_BRIDGE_INIT_INFO_
 #endif
 #endif
 
-#if defined(FIX_HW_BRN_31542)
+#if defined(FIX_HW_BRN_31542) || defined(FIX_HW_BRN_36513)
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID hKernelClearClipWAVDMStreamMemInfo;
 	IMG_SID hKernelClearClipWAIndexStreamMemInfo;
@@ -157,7 +173,7 @@ typedef struct _SGX_BRIDGE_INIT_INFO_
 #endif
 #endif
 
-#if defined(SGX_FEATURE_VDM_CONTEXT_SWITCH) && defined(FIX_HW_BRN_31425)
+#if defined(SGX_FEATURE_VDM_CONTEXT_SWITCH) && defined(FIX_HW_BRN_31559)
 	IMG_HANDLE	hKernelVDMSnapShotBufferMemInfo;
 	IMG_HANDLE	hKernelVDMCtrlStreamBufferMemInfo;
 #endif
@@ -172,13 +188,6 @@ typedef struct _SGX_BRIDGE_INIT_INFO_
 	IMG_HANDLE	hKernelEDMStatusBufferMemInfo;
 #endif
 #endif
-#if defined(SGX_FEATURE_OVERLAPPED_SPM)
-#if defined (SUPPORT_SID_INTERFACE)
-	IMG_SID		hKernelTmpRgnHeaderMemInfo;
-#else
-	IMG_HANDLE hKernelTmpRgnHeaderMemInfo;
-#endif
-#endif
 
 	IMG_UINT32 ui32EDMTaskReg0;
 	IMG_UINT32 ui32EDMTaskReg1;
@@ -192,7 +201,7 @@ typedef struct _SGX_BRIDGE_INIT_INFO_
 	IMG_UINT32 ui32MasterClkGateStatusMask;
 	IMG_UINT32 ui32MasterClkGateStatus2Reg;
 	IMG_UINT32 ui32MasterClkGateStatus2Mask;
-#endif 
+#endif /* SGX_FEATURE_MP */
 
 	IMG_UINT32 ui32CacheControl;
 
@@ -222,7 +231,7 @@ typedef struct _SGX_DEVICE_SYNC_LIST_
 
 	struct _SGX_DEVICE_SYNC_LIST_	*psNext;
 
-	
+	/* Must be the last variable in the structure */
 	IMG_UINT32			ui32NumSyncObjects;
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID				ahSyncHandles[1];
@@ -259,7 +268,7 @@ typedef struct _SGX_CCB_KICK_
 	IMG_HANDLE	hKernelHWSyncListMemInfo;
 #endif
 
-	
+	/* DST syncs */
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID		*pahDstSyncHandles;
 #else
@@ -288,11 +297,11 @@ typedef struct _SGX_CCB_KICK_
 #endif
 	IMG_BOOL	bLastInScene;
 
-	
+	/* CCB offset of data structure associated with this kick */
 	IMG_UINT32	ui32CCBOffset;
 
 #if defined(SUPPORT_SGX_GENERALISED_SYNCOBJECTS)
-	
+	/* SRC and DST syncs */
 	IMG_UINT32	ui32NumTASrcSyncs;
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID		ahTASrcKernelSyncInfo[SGX_MAX_TA_SRC_SYNCS];
@@ -312,16 +321,16 @@ typedef struct _SGX_CCB_KICK_
 	IMG_HANDLE	ah3DSrcKernelSyncInfo[SGX_MAX_3D_SRC_SYNCS];
 #endif
 #else
-	
+	/* SRC syncs */
 	IMG_UINT32	ui32NumSrcSyncs;
 #if defined (SUPPORT_SID_INTERFACE)
-	IMG_SID		ahSrcKernelSyncInfo[SGX_MAX_SRC_SYNCS];
+	IMG_SID		ahSrcKernelSyncInfo[SGX_MAX_SRC_SYNCS_TA];
 #else
-	IMG_HANDLE	ahSrcKernelSyncInfo[SGX_MAX_SRC_SYNCS];
+	IMG_HANDLE	ahSrcKernelSyncInfo[SGX_MAX_SRC_SYNCS_TA];
 #endif
 #endif
 
-	
+	/* TA/3D dependency data */
 	IMG_BOOL	bTADependency;
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID		hTA3DSyncInfo;
@@ -344,19 +353,31 @@ typedef struct _SGX_CCB_KICK_
 } SGX_CCB_KICK;
 
 
+/*!
+ ******************************************************************************
+ * shared client/kernel device information structure for SGX
+ *****************************************************************************/
 #define SGX_KERNEL_USE_CODE_BASE_INDEX		15
 
 
+/*!
+ ******************************************************************************
+ * Client device information structure for SGX
+ *****************************************************************************/
 typedef struct _SGX_CLIENT_INFO_
 {
-	IMG_UINT32					ui32ProcessID;			
-	IMG_VOID					*pvProcess;				
-	PVRSRV_MISC_INFO			sMiscInfo;				
+	IMG_UINT32					ui32ProcessID;			/*!< ID of process controlling SGX device */
+	IMG_VOID					*pvProcess;				/*!< pointer to OS specific 'process' structure */
+	PVRSRV_MISC_INFO			sMiscInfo;				/*!< Misc. Information, inc. SOC specifics */
 
 	IMG_UINT32					asDevData[SGX_MAX_DEV_DATA];
 
 } SGX_CLIENT_INFO;
 
+/*!
+ ******************************************************************************
+ * Internal device information structure for SGX
+ *****************************************************************************/
 typedef struct _SGX_INTERNAL_DEVINFO_
 {
 	IMG_UINT32			ui32Flags;
@@ -436,24 +457,24 @@ typedef struct _PVRSRV_2D_SGX_KICK_
 #if defined (SUPPORT_SID_INTERFACE)
 	IMG_SID			ahSrcSyncInfo[SGX_MAX_2D_SRC_SYNC_OPS];
 
-	
+	/* need to be able to check reads and writes on dest, and update writes */
 	IMG_SID	 		hDstSyncInfo;
 
-	
+	/* need to be able to check reads and writes on TA ops, and update writes */
 	IMG_SID			hTASyncInfo;
 
-	
+	/* need to be able to check reads and writes on 2D ops, and update writes */
 	IMG_SID			h3DSyncInfo;
 #else
 	IMG_HANDLE		ahSrcSyncInfo[SGX_MAX_2D_SRC_SYNC_OPS];
 
-	
+	/* need to be able to check reads and writes on dest, and update writes */
 	IMG_HANDLE 		hDstSyncInfo;
 
-	
+	/* need to be able to check reads and writes on TA ops, and update writes */
 	IMG_HANDLE		hTASyncInfo;
 
-	
+	/* need to be able to check reads and writes on 2D ops, and update writes */
 	IMG_HANDLE		h3DSyncInfo;
 #endif
 
@@ -463,8 +484,11 @@ typedef struct _PVRSRV_2D_SGX_KICK_
 #endif
 	IMG_HANDLE		hDevMemContext;
 } PVRSRV_2D_SGX_KICK, *PPVRSRV_2D_SGX_KICK;
-#endif	
-#endif	
+#endif	/* defined(SGX_FEATURE_2D_HARDWARE) */
+#endif	/* defined(TRANSFER_QUEUE) */
 
 
-#endif 
+#endif /* __SGXINFO_H__ */
+/******************************************************************************
+ End of file (sgxinfo.h)
+******************************************************************************/