1 files changed, 50 insertions, 12 deletions

diff --git a/drivers/gpu/pvr/pvrsrv.c b/drivers/gpu/pvr/pvrsrv.c
index 5862fb925f8..cb05a59e8aa 100644
--- a/drivers/gpu/pvr/pvrsrv.c
+++ b/drivers/gpu/pvr/pvrsrv.c
@@ -32,6 +32,9 @@
 #include "pdump_km.h"
 #include "deviceid.h"
 #include "ra.h"
+#if defined(TTRACE)
+#include "ttrace.h"
+#endif
 
 #include "pvrversion.h"
 
@@ -40,6 +43,7 @@
 IMG_UINT32      g_ui32InitFlags;
 
 #define         INIT_DATA_ENABLE_PDUMPINIT      0x1U
+#define         INIT_DATA_ENABLE_TTARCE         0x2U
 
 PVRSRV_ERROR AllocateDeviceID(SYS_DATA *psSysData, IMG_UINT32 *pui32DevID)
 {
@@ -238,12 +242,24 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVInit(PSYS_DATA psSysData)
                 goto Error;
         }
 
-        if(OSEventObjectCreate("PVRSRV_GLOBAL_EVENTOBJECT", psSysData->psGlobalEventObject) != PVRSRV_OK)
+        if(OSEventObjectCreateKM("PVRSRV_GLOBAL_EVENTOBJECT", psSysData->psGlobalEventObject) != PVRSRV_OK)
         {
                 goto Error;
         }
 
         
+        psSysData->pfnHighResTimerCreate = OSFuncHighResTimerCreate;
+        psSysData->pfnHighResTimerGetus = OSFuncHighResTimerGetus;
+        psSysData->pfnHighResTimerDestroy = OSFuncHighResTimerDestroy;
+
+#if defined(TTRACE)
+        eError = PVRSRVTimeTraceInit();
+        if (eError != PVRSRV_OK)
+                goto Error;
+        g_ui32InitFlags |= INIT_DATA_ENABLE_TTARCE;
+#endif
+
+        
         PDUMPINIT();
         g_ui32InitFlags |= INIT_DATA_ENABLE_PDUMPINIT;
 
@@ -267,7 +283,13 @@ IMG_VOID IMG_CALLCONV PVRSRVDeInit(PSYS_DATA psSysData)
                 PVR_DPF((PVR_DBG_ERROR,"PVRSRVDeInit: PVRSRVHandleDeInit failed - invalid param"));
                 return;
         }
-
+#if defined(TTRACE)
+        
+        if ((g_ui32InitFlags & INIT_DATA_ENABLE_TTARCE) > 0)
+        {
+                PVRSRVTimeTraceDeinit();
+        }
+#endif
         
         if( (g_ui32InitFlags & INIT_DATA_ENABLE_PDUMPINIT) > 0)
         {
@@ -277,7 +299,7 @@ IMG_VOID IMG_CALLCONV PVRSRVDeInit(PSYS_DATA psSysData)
         
         if(psSysData->psGlobalEventObject)
         {
-                OSEventObjectDestroy(psSysData->psGlobalEventObject);
+                OSEventObjectDestroyKM(psSysData->psGlobalEventObject);
                 OSFreeMem( PVRSRV_PAGEABLE_SELECT,
                                                  sizeof(PVRSRV_EVENTOBJECT),
                                                  psSysData->psGlobalEventObject,
@@ -621,14 +643,14 @@ PVRSRV_ERROR IMG_CALLCONV PollForValueKM (volatile IMG_UINT32*	pui32LinMemAddr,
                                                                                   IMG_BOOL                              bAllowPreemption)
 {
         {
-                IMG_UINT32      ui32ActualValue = 0xFFFFFFFFU;
+                IMG_UINT32      ui32ActualValue = 0xFFFFFFFFU; 
 
                 if (bAllowPreemption)
                 {
                         PVR_ASSERT(ui32PollPeriodus >= 1000);
                 }
 
-
+                 
                 LOOP_UNTIL_TIMEOUT(ui32Timeoutus)
                 {
                         ui32ActualValue = (*pui32LinMemAddr & ui32Mask);
@@ -636,7 +658,7 @@ PVRSRV_ERROR IMG_CALLCONV PollForValueKM (volatile IMG_UINT32*	pui32LinMemAddr,
                         {
                                 return PVRSRV_OK;
                         }
-
+                        
                         if (bAllowPreemption)
                         {
                                 OSSleepms(ui32PollPeriodus / 1000);
@@ -646,7 +668,7 @@ PVRSRV_ERROR IMG_CALLCONV PollForValueKM (volatile IMG_UINT32*	pui32LinMemAddr,
                                 OSWaitus(ui32PollPeriodus);
                         }
                 } END_LOOP_UNTIL_TIMEOUT();
-
+        
                 PVR_DPF((PVR_DBG_ERROR,"PollForValueKM: Timeout. Expected 0x%x but found 0x%x (mask 0x%x).",
                                 ui32Value, ui32ActualValue, ui32Mask));
         }
@@ -666,7 +688,7 @@ static IMG_VOID PVRSRVGetMiscInfoKM_RA_GetStats_ForEachVaCb(BM_HEAP *psBMHeap, v
         pui32StrLen = va_arg(va, IMG_UINT32*);
         ui32Mode = va_arg(va, IMG_UINT32);
 
-
+        
         switch(ui32Mode)
         {
                 case PVRSRV_MISC_INFO_MEMSTATS_PRESENT:
@@ -762,7 +784,11 @@ static PVRSRV_ERROR PVRSRVGetMiscInfoKM_Device_AnyVaCb(PVRSRV_DEVICE_NODE *psDev
 
 
 IMG_EXPORT
+#if defined (SUPPORT_SID_INTERFACE)
+PVRSRV_ERROR IMG_CALLCONV PVRSRVGetMiscInfoKM(PVRSRV_MISC_INFO_KM *psMiscInfo)
+#else
 PVRSRV_ERROR IMG_CALLCONV PVRSRVGetMiscInfoKM(PVRSRV_MISC_INFO *psMiscInfo)
+#endif
 {
         SYS_DATA *psSysData;
 
@@ -857,7 +883,7 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVGetMiscInfoKM(PVRSRV_MISC_INFO *psMiscInfo)
         }
 
         
-        if((psMiscInfo->ui32StateRequest & PVRSRV_MISC_INFO_FREEMEM_PRESENT)
+        if(((psMiscInfo->ui32StateRequest & PVRSRV_MISC_INFO_FREEMEM_PRESENT) != 0)
                 && psMiscInfo->pszMemoryStr)
         {
                 IMG_CHAR                        *pszStr;
@@ -929,6 +955,8 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVGetMiscInfoKM(PVRSRV_MISC_INFO *psMiscInfo)
 
         if((psMiscInfo->ui32StateRequest & PVRSRV_MISC_INFO_CPUCACHEOP_PRESENT) != 0UL)
         {
+                psMiscInfo->ui32StatePresent |= PVRSRV_MISC_INFO_CPUCACHEOP_PRESENT;
+
                 if(psMiscInfo->sCacheOpCtl.bDeferOp)
                 {
                         
@@ -936,10 +964,16 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVGetMiscInfoKM(PVRSRV_MISC_INFO *psMiscInfo)
                 }
                 else
                 {
+#if defined (SUPPORT_SID_INTERFACE)
+                        PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo = psMiscInfo->sCacheOpCtl.psKernelMemInfo;
+
+                        if(!psMiscInfo->sCacheOpCtl.psKernelMemInfo)
+#else
                         PVRSRV_KERNEL_MEM_INFO *psKernelMemInfo;
                         PVRSRV_PER_PROCESS_DATA *psPerProc;
 
                         if(!psMiscInfo->sCacheOpCtl.u.psKernelMemInfo)
+#endif
                         {
                                 PVR_DPF((PVR_DBG_WARNING, "PVRSRVGetMiscInfoKM: "
                                                  "Ignoring non-deferred cache op with no meminfo"));
@@ -953,6 +987,9 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVGetMiscInfoKM(PVRSRV_MISC_INFO *psMiscInfo)
                                                  "to combine deferred cache ops with immediate ones"));
                         }
 
+#if defined (SUPPORT_SID_INTERFACE)
+                        PVR_DBG_BREAK
+#else
                         
                         psPerProc = PVRSRVFindPerProcessData();
 
@@ -965,6 +1002,7 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVGetMiscInfoKM(PVRSRV_MISC_INFO *psMiscInfo)
                                                  "Can't find kernel meminfo"));
                                 return PVRSRV_ERROR_INVALID_PARAMS;
                         }
+#endif
 
                         if(psMiscInfo->sCacheOpCtl.eCacheOpType == PVRSRV_MISC_INFO_CPUCACHEOP_FLUSH)
                         {
@@ -1109,9 +1147,9 @@ IMG_VOID IMG_CALLCONV PVRSRVMISR(IMG_VOID *pvSysData)
                                                                         &PVRSRVMISR_ForEachCb);
 
         
-        if (PVRSRVProcessQueues(ISR_ID, IMG_FALSE) == PVRSRV_ERROR_PROCESSING_BLOCKED)
+        if (PVRSRVProcessQueues(IMG_FALSE) == PVRSRV_ERROR_PROCESSING_BLOCKED)
         {
-                PVRSRVProcessQueues(ISR_ID, IMG_FALSE);
+                PVRSRVProcessQueues(IMG_FALSE);
         }
 
         
@@ -1120,7 +1158,7 @@ IMG_VOID IMG_CALLCONV PVRSRVMISR(IMG_VOID *pvSysData)
                 IMG_HANDLE hOSEventKM = psSysData->psGlobalEventObject->hOSEventKM;
                 if(hOSEventKM)
                 {
-                        OSEventObjectSignal(hOSEventKM);
+                        OSEventObjectSignalKM(hOSEventKM);
                 }
         }
 }