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
 
 #define SYS_MAX_LOCAL_DEVMEM_ARENAS     4
 
+typedef IMG_HANDLE (*PFN_HTIMER_CREATE) (IMG_VOID);
+typedef IMG_UINT32 (*PFN_HTIMER_GETUS) (IMG_HANDLE);
+typedef IMG_VOID (*PFN_HTIMER_DESTROY) (IMG_HANDLE);
 typedef struct _SYS_DATA_TAG_
 {
     IMG_UINT32                  ui32NumDevices;                 
@@ -81,14 +84,20 @@ typedef struct _SYS_DATA_TAG_
         struct _DEVICE_COMMAND_DATA_ *apsDeviceCommandData[SYS_DEVICE_COUNT];
                                                                                                                         
 
-        IMG_BOOL                    bReProcessQueues;                   
-
         RA_ARENA                                        *apsLocalDevMemArena[SYS_MAX_LOCAL_DEVMEM_ARENAS]; 
 
     IMG_CHAR                    *pszVersionString;          
-        PVRSRV_EVENTOBJECT                      *psGlobalEventObject;                   
+#if defined (SUPPORT_SID_INTERFACE)
+        PVRSRV_EVENTOBJECT_KM           *psGlobalEventObject;           
+#else
+        PVRSRV_EVENTOBJECT                      *psGlobalEventObject;           
+#endif
 
         PVRSRV_MISC_INFO_CPUCACHEOP_TYPE ePendingCacheOpType;   
+
+        PFN_HTIMER_CREATE       pfnHighResTimerCreate;
+        PFN_HTIMER_GETUS        pfnHighResTimerGetus;
+        PFN_HTIMER_DESTROY      pfnHighResTimerDestroy;
 } SYS_DATA;
 
 
@@ -120,8 +129,8 @@ PVRSRV_ERROR SysDevicePostPowerState(IMG_UINT32 ui32DeviceIndex,
                                                                          PVRSRV_DEV_POWER_STATE eCurrentPowerState);
 
 #if defined(SYS_CUSTOM_POWERLOCK_WRAP)
-PVRSRV_ERROR SysPowerLockWrap(SYS_DATA *psSysData);
-IMG_VOID SysPowerLockUnwrap(SYS_DATA *psSysData);
+PVRSRV_ERROR SysPowerLockWrap(IMG_VOID);
+IMG_VOID SysPowerLockUnwrap(IMG_VOID);
 #endif
 
 PVRSRV_ERROR SysOEMFunction (   IMG_UINT32      ui32ID,
@@ -143,6 +152,7 @@ IMG_BOOL SysVerifySysPAddrToDevPAddr (PVRSRV_DEVICE_TYPE eDeviceType, IMG_SYS_PH
 
 extern SYS_DATA* gpsSysData;
 
+
 #if !defined(USE_CODE)
 
 #ifdef INLINE_IS_PRAGMA
@@ -216,5 +226,37 @@ static inline IMG_VOID SysWriteHWReg(IMG_PVOID pvLinRegBaseAddr, IMG_UINT32 ui32
 }
 #endif
 
+#ifdef INLINE_IS_PRAGMA
+#pragma inline(SysHighResTimerCreate)
+#endif
+static INLINE IMG_HANDLE SysHighResTimerCreate(IMG_VOID)
+{
+        SYS_DATA *psSysData;
+
+        SysAcquireData(&psSysData);
+        return psSysData->pfnHighResTimerCreate();
+}
+
+#ifdef INLINE_IS_PRAGMA
+#pragma inline(SysHighResTimerGetus)
+#endif
+static INLINE IMG_UINT32 SysHighResTimerGetus(IMG_HANDLE hTimer)
+{
+        SYS_DATA *psSysData;
+
+        SysAcquireData(&psSysData);
+        return psSysData->pfnHighResTimerGetus(hTimer);
+}
+
+#ifdef INLINE_IS_PRAGMA
+#pragma inline(SysHighResTimerDestroy)
+#endif
+static INLINE IMG_VOID SysHighResTimerDestroy(IMG_HANDLE hTimer)
+{
+        SYS_DATA *psSysData;
+
+        SysAcquireData(&psSysData);
+        psSysData->pfnHighResTimerDestroy(hTimer);
+}
 #endif