aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/pvr/syscommon.h
diff options
context:
space:
mode:
authorRodrigo Obregon <robregon@ti.com>2011-08-25 03:00:15 -0400
committerPaolo Pisati <paolo.pisati@canonical.com>2012-08-17 04:18:37 -0400
commit10544db2e8800cd0f7c9b48d50ecc2070a9ed019 (patch)
tree3df850016a4708ffd956b2cbbe60a168f78c853b /drivers/gpu/pvr/syscommon.h
parent2d8710c0d6d3e8a537676decab8cb51d1343f2f8 (diff)
OMAP4: SGX-KM: Update DDK version to 1.7.17.3556
This patch updates the DDK to version 1.7.17.3556 The corresponding change in the user side most be in place for this DDK to work. Change-Id: I57ab5c29e7cf89bfce2388428914cc1f1474be6d Signed-off-by: Rodrigo Obregon <robregon@ti.com>
Diffstat (limited to 'drivers/gpu/pvr/syscommon.h')
-rw-r--r--drivers/gpu/pvr/syscommon.h52
1 files changed, 47 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/syscommon.h b/drivers/gpu/pvr/syscommon.h
index 38b610738dd..46ac17375d1 100644
--- a/drivers/gpu/pvr/syscommon.h
+++ b/drivers/gpu/pvr/syscommon.h
@@ -57,6 +57,9 @@ typedef struct _SYS_DEVICE_ID_TAG
57 57
58#define SYS_MAX_LOCAL_DEVMEM_ARENAS 4 58#define SYS_MAX_LOCAL_DEVMEM_ARENAS 4
59 59
60typedef IMG_HANDLE (*PFN_HTIMER_CREATE) (IMG_VOID);
61typedef IMG_UINT32 (*PFN_HTIMER_GETUS) (IMG_HANDLE);
62typedef IMG_VOID (*PFN_HTIMER_DESTROY) (IMG_HANDLE);
60typedef struct _SYS_DATA_TAG_ 63typedef struct _SYS_DATA_TAG_
61{ 64{
62 IMG_UINT32 ui32NumDevices; 65 IMG_UINT32 ui32NumDevices;
@@ -81,14 +84,20 @@ typedef struct _SYS_DATA_TAG_
81 struct _DEVICE_COMMAND_DATA_ *apsDeviceCommandData[SYS_DEVICE_COUNT]; 84 struct _DEVICE_COMMAND_DATA_ *apsDeviceCommandData[SYS_DEVICE_COUNT];
82 85
83 86
84 IMG_BOOL bReProcessQueues;
85
86 RA_ARENA *apsLocalDevMemArena[SYS_MAX_LOCAL_DEVMEM_ARENAS]; 87 RA_ARENA *apsLocalDevMemArena[SYS_MAX_LOCAL_DEVMEM_ARENAS];
87 88
88 IMG_CHAR *pszVersionString; 89 IMG_CHAR *pszVersionString;
89 PVRSRV_EVENTOBJECT *psGlobalEventObject; 90#if defined (SUPPORT_SID_INTERFACE)
91 PVRSRV_EVENTOBJECT_KM *psGlobalEventObject;
92#else
93 PVRSRV_EVENTOBJECT *psGlobalEventObject;
94#endif
90 95
91 PVRSRV_MISC_INFO_CPUCACHEOP_TYPE ePendingCacheOpType; 96 PVRSRV_MISC_INFO_CPUCACHEOP_TYPE ePendingCacheOpType;
97
98 PFN_HTIMER_CREATE pfnHighResTimerCreate;
99 PFN_HTIMER_GETUS pfnHighResTimerGetus;
100 PFN_HTIMER_DESTROY pfnHighResTimerDestroy;
92} SYS_DATA; 101} SYS_DATA;
93 102
94 103
@@ -120,8 +129,8 @@ PVRSRV_ERROR SysDevicePostPowerState(IMG_UINT32 ui32DeviceIndex,
120 PVRSRV_DEV_POWER_STATE eCurrentPowerState); 129 PVRSRV_DEV_POWER_STATE eCurrentPowerState);
121 130
122#if defined(SYS_CUSTOM_POWERLOCK_WRAP) 131#if defined(SYS_CUSTOM_POWERLOCK_WRAP)
123PVRSRV_ERROR SysPowerLockWrap(SYS_DATA *psSysData); 132PVRSRV_ERROR SysPowerLockWrap(IMG_VOID);
124IMG_VOID SysPowerLockUnwrap(SYS_DATA *psSysData); 133IMG_VOID SysPowerLockUnwrap(IMG_VOID);
125#endif 134#endif
126 135
127PVRSRV_ERROR SysOEMFunction ( IMG_UINT32 ui32ID, 136PVRSRV_ERROR SysOEMFunction ( IMG_UINT32 ui32ID,
@@ -143,6 +152,7 @@ IMG_BOOL SysVerifySysPAddrToDevPAddr (PVRSRV_DEVICE_TYPE eDeviceType, IMG_SYS_PH
143 152
144extern SYS_DATA* gpsSysData; 153extern SYS_DATA* gpsSysData;
145 154
155
146#if !defined(USE_CODE) 156#if !defined(USE_CODE)
147 157
148#ifdef INLINE_IS_PRAGMA 158#ifdef INLINE_IS_PRAGMA
@@ -216,5 +226,37 @@ static inline IMG_VOID SysWriteHWReg(IMG_PVOID pvLinRegBaseAddr, IMG_UINT32 ui32
216} 226}
217#endif 227#endif
218 228
229#ifdef INLINE_IS_PRAGMA
230#pragma inline(SysHighResTimerCreate)
231#endif
232static INLINE IMG_HANDLE SysHighResTimerCreate(IMG_VOID)
233{
234 SYS_DATA *psSysData;
235
236 SysAcquireData(&psSysData);
237 return psSysData->pfnHighResTimerCreate();
238}
239
240#ifdef INLINE_IS_PRAGMA
241#pragma inline(SysHighResTimerGetus)
242#endif
243static INLINE IMG_UINT32 SysHighResTimerGetus(IMG_HANDLE hTimer)
244{
245 SYS_DATA *psSysData;
246
247 SysAcquireData(&psSysData);
248 return psSysData->pfnHighResTimerGetus(hTimer);
249}
250
251#ifdef INLINE_IS_PRAGMA
252#pragma inline(SysHighResTimerDestroy)
253#endif
254static INLINE IMG_VOID SysHighResTimerDestroy(IMG_HANDLE hTimer)
255{
256 SYS_DATA *psSysData;
257
258 SysAcquireData(&psSysData);
259 psSysData->pfnHighResTimerDestroy(hTimer);
260}
219#endif 261#endif
220 262