1 files changed, 214 insertions, 87 deletions

diff --git a/drivers/gpu/pvr/sgx/sgxutils.c b/drivers/gpu/pvr/sgx/sgxutils.c
index 7f640885b7f..0b205c5029f 100644
--- a/drivers/gpu/pvr/sgx/sgxutils.c
+++ b/drivers/gpu/pvr/sgx/sgxutils.c
@@ -40,6 +40,7 @@
 #include "osfunc.h"
 #include "pvr_debug.h"
 #include "sgxutils.h"
+#include "ttrace.h"
 
 #ifdef __linux__
 #include <linux/kernel.h>       
@@ -149,16 +150,23 @@ static INLINE SGXMKIF_COMMAND * SGXAcquireKernelCCBSlot(PVRSRV_SGX_CCB_INFO *psC
         return IMG_NULL;
 }
 
-PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO   *psDevInfo,
+PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_DEVICE_NODE   *psDeviceNode,
                                                                    SGXMKIF_CMD_TYPE             eCmdType,
                                                                    SGXMKIF_COMMAND              *psCommandData,
                                                                    IMG_UINT32                   ui32CallerID,
                                                                    IMG_UINT32                   ui32PDumpFlags,
-                                                                   IMG_BOOL                     bLastInScene)
+                                                                   IMG_HANDLE                   hDevMemContext,
+                                                                   IMG_BOOL                             bLastInScene)
 {
         PVRSRV_SGX_CCB_INFO *psKernelCCB;
         PVRSRV_ERROR eError = PVRSRV_OK;
         SGXMKIF_COMMAND *psSGXCommand;
+        PVRSRV_SGXDEV_INFO      *psDevInfo = psDeviceNode->pvDevice;
+#if defined(FIX_HW_BRN_31620)
+        IMG_UINT32 ui32CacheMasks[4];
+        IMG_UINT32 i;
+        MMU_CONTEXT             *psMMUContext;
+#endif
 #if defined(PDUMP)
         IMG_VOID *pvDumpCommand;
         IMG_BOOL bPDumpIsSuspended = PDumpIsSuspended();
@@ -168,12 +176,37 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
         PVR_UNREFERENCED_PARAMETER(ui32PDumpFlags);
 #endif
 
-#if defined(FIX_HW_BRN_28889)
+#if defined(FIX_HW_BRN_31620)
+        for(i=0;i<4;i++)
+        {
+                ui32CacheMasks[i] = 0;
+        }
 
+        psMMUContext = psDevInfo->hKernelMMUContext;
+        psDeviceNode->pfnMMUGetCacheFlushRange(psMMUContext, &ui32CacheMasks[0]);
 
+        
+        if (hDevMemContext)
+        {
+                BM_CONTEXT *psBMContext = (BM_CONTEXT *) hDevMemContext;
 
+                psMMUContext = psBMContext->psMMUContext;
+                psDeviceNode->pfnMMUGetCacheFlushRange(psMMUContext, &ui32CacheMasks[2]);
+        }
 
-        if ( (eCmdType != SGXMKIF_CMD_PROCESS_QUEUES) &&
+        
+        if (ui32CacheMasks[0] || ui32CacheMasks[1] || ui32CacheMasks[2] || ui32CacheMasks[3])
+        {
+                psDevInfo->ui32CacheControl |= SGXMKIF_CC_INVAL_BIF_PD;
+        }
+#endif
+
+#if defined(FIX_HW_BRN_28889)
+        
+
+
+
+        if ( (eCmdType != SGXMKIF_CMD_PROCESS_QUEUES) && 
                  ((psDevInfo->ui32CacheControl & SGXMKIF_CC_INVAL_DATA) != 0) &&
                  ((psDevInfo->ui32CacheControl & (SGXMKIF_CC_INVAL_BIF_PT | SGXMKIF_CC_INVAL_BIF_PD)) != 0))
         {
@@ -183,18 +216,19 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
                 SGXMKIF_HOST_CTL        *psSGXHostCtl = psDevInfo->psSGXHostCtl;
                 SGXMKIF_COMMAND         sCacheCommand = {0};
 
-                eError = SGXScheduleCCBCommand(psDevInfo,
+                eError = SGXScheduleCCBCommand(psDeviceNode,
                                                                            SGXMKIF_CMD_PROCESS_QUEUES,
                                                                            &sCacheCommand,
                                                                            ui32CallerID,
                                                                            ui32PDumpFlags,
+                                                                           hDevMemContext,
                                                                            bLastInScene);
                 if (eError != PVRSRV_OK)
                 {
                         goto Exit;
                 }
-
-
+                
+                
                 #if !defined(NO_HARDWARE)
                 if(PollForValueKM(&psSGXHostCtl->ui32InvalStatus,
                                                   PVRSRV_USSE_EDM_BIF_INVAL_COMPLETE,
@@ -207,9 +241,9 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
                         PVR_DBG_BREAK;
                 }
                 #endif
-
+        
                 #if defined(PDUMP)
-
+                
                 PDUMPCOMMENTWITHFLAGS(0, "Host Control - Poll for BIF cache invalidate request to complete");
                 PDUMPMEMPOL(psSGXHostCtlMemInfo,
                                         offsetof(SGXMKIF_HOST_CTL, ui32InvalStatus),
@@ -218,15 +252,63 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
                                         PDUMP_POLL_OPERATOR_EQUAL,
                                         0,
                                         MAKEUNIQUETAG(psSGXHostCtlMemInfo));
-                #endif
-
+                #endif 
+        
                 psSGXHostCtl->ui32InvalStatus &= ~(PVRSRV_USSE_EDM_BIF_INVAL_COMPLETE);
                 PDUMPMEM(IMG_NULL, psSGXHostCtlMemInfo, offsetof(SGXMKIF_HOST_CTL, ui32CleanupStatus), sizeof(IMG_UINT32), 0, MAKEUNIQUETAG(psSGXHostCtlMemInfo));
         }
+#else 
+        PVR_UNREFERENCED_PARAMETER(hDevMemContext);
 #endif
+        
+#if defined(FIX_HW_BRN_31620)
+        if ((eCmdType != SGXMKIF_CMD_FLUSHPDCACHE) && (psDevInfo->ui32CacheControl & SGXMKIF_CC_INVAL_BIF_PD))
+        {
+                SGXMKIF_COMMAND         sPDECacheCommand = {0};
+                IMG_DEV_PHYADDR         sDevPAddr;
 
-#if defined(PDUMP)
+                
+                psMMUContext = psDevInfo->hKernelMMUContext;
+
+                psDeviceNode->pfnMMUGetPDPhysAddr(psMMUContext, &sDevPAddr);
+                sPDECacheCommand.ui32Data[0] = sDevPAddr.uiAddr | 1;
+                sPDECacheCommand.ui32Data[1] = ui32CacheMasks[0];
+                sPDECacheCommand.ui32Data[2] = ui32CacheMasks[1];
+
+                
+                if (hDevMemContext)
+                {
+                        BM_CONTEXT *psBMContext = (BM_CONTEXT *) hDevMemContext;
 
+                        psMMUContext = psBMContext->psMMUContext;
+
+                        psDeviceNode->pfnMMUGetPDPhysAddr(psMMUContext, &sDevPAddr);
+                        
+                        sPDECacheCommand.ui32Data[3] = sDevPAddr.uiAddr | 1;
+                        sPDECacheCommand.ui32Data[4] = ui32CacheMasks[2];
+                        sPDECacheCommand.ui32Data[5] = ui32CacheMasks[3];
+                }
+
+                
+                if (sPDECacheCommand.ui32Data[1] | sPDECacheCommand.ui32Data[2] | sPDECacheCommand.ui32Data[4] |
+                        sPDECacheCommand.ui32Data[5])
+                {
+                        eError = SGXScheduleCCBCommand(psDeviceNode,
+                                                                                   SGXMKIF_CMD_FLUSHPDCACHE,
+                                                                                   &sPDECacheCommand,
+                                                                                   ui32CallerID,
+                                                                                   ui32PDumpFlags,
+                                                                                   hDevMemContext,
+                                                                                   bLastInScene);
+                        if (eError != PVRSRV_OK)
+                        {
+                                goto Exit;
+                        }
+                }
+        }
+#endif
+#if defined(PDUMP)
+        
         {
                 PVRSRV_PER_PROCESS_DATA* psPerProc = PVRSRVFindPerProcessData();
                 if(psPerProc != IMG_NULL)
@@ -234,44 +316,45 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
                         bPersistentProcess = psPerProc->bPDumpPersistent;
                 }
         }
-#endif
+#endif 
         psKernelCCB = psDevInfo->psKernelCCBInfo;
 
         psSGXCommand = SGXAcquireKernelCCBSlot(psKernelCCB);
 
-
+        
         if(!psSGXCommand)
         {
+                PVR_DPF((PVR_DBG_ERROR, "SGXScheduleCCBCommand: Wait for CCB space timed out")) ;
                 eError = PVRSRV_ERROR_TIMEOUT;
                 goto Exit;
         }
 
-
+        
         psCommandData->ui32CacheControl = psDevInfo->ui32CacheControl;
 
 #if defined(PDUMP)
-
+        
         psDevInfo->sPDContext.ui32CacheControl |= psDevInfo->ui32CacheControl;
 #endif
 
-
+        
         psDevInfo->ui32CacheControl = 0;
 
-
+        
         *psSGXCommand = *psCommandData;
 
         if (eCmdType >= SGXMKIF_CMD_MAX)
         {
-                PVR_DPF((PVR_DBG_ERROR,"SGXScheduleCCBCommandKM: Unknown command type: %d", eCmdType)) ;
+                PVR_DPF((PVR_DBG_ERROR, "SGXScheduleCCBCommand: Unknown command type: %d", eCmdType)) ;
                 eError = PVRSRV_ERROR_INVALID_CCB_COMMAND;
                 goto Exit;
         }
 
-        if((eCmdType == SGXMKIF_CMD_TA) && bLastInScene)
+        if ((eCmdType == SGXMKIF_CMD_TA) && bLastInScene)
         {
                 SYS_DATA *psSysData;
 
-
+                
                 SysAcquireData(&psSysData);
 
                 if(psSysData->ePendingCacheOpType == PVRSRV_MISC_INFO_CPUCACHEOP_FLUSH)
@@ -283,18 +366,18 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
                         OSCleanCPUCacheKM();
                 }
 
-
+                
                 psSysData->ePendingCacheOpType = PVRSRV_MISC_INFO_CPUCACHEOP_NONE;
         }
 
         PVR_ASSERT(eCmdType < SGXMKIF_CMD_MAX);
-        psSGXCommand->ui32ServiceAddress = psDevInfo->aui32HostKickAddr[eCmdType];
+        psSGXCommand->ui32ServiceAddress = psDevInfo->aui32HostKickAddr[eCmdType];       
 
 #if defined(PDUMP)
         if ((ui32CallerID != ISR_ID) && (bPDumpIsSuspended == IMG_FALSE) &&
                 (bPersistentProcess == IMG_FALSE) )
         {
-
+                
                 PDUMPCOMMENTWITHFLAGS(ui32PDumpFlags, "Poll for space in the Kernel CCB\r\n");
                 PDUMPMEMPOL(psKernelCCB->psCCBCtlMemInfo,
                                         offsetof(PVRSRV_SGX_CCB_CTL, ui32ReadOffset),
@@ -314,7 +397,7 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
                                         ui32PDumpFlags,
                                         MAKEUNIQUETAG(psKernelCCB->psCCBMemInfo));
 
-
+                
                 PDUMPMEM(&psDevInfo->sPDContext.ui32CacheControl,
                                         psKernelCCB->psCCBMemInfo,
                                         psKernelCCB->ui32CCBDumpWOff * sizeof(SGXMKIF_COMMAND) +
@@ -326,14 +409,14 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
                 if (PDumpIsCaptureFrameKM()
                 || ((ui32PDumpFlags & PDUMP_FLAGS_CONTINUOUS) != 0))
                 {
-
+                        
                         psDevInfo->sPDContext.ui32CacheControl = 0;
                 }
         }
 #endif
 
 #if defined(FIX_HW_BRN_26620) && defined(SGX_FEATURE_SYSTEM_CACHE) && !defined(SGX_BYPASS_SYSTEM_CACHE)
-
+        
         eError = PollForValueKM (psKernelCCB->pui32ReadOffset,
                                                                 *psKernelCCB->pui32WriteOffset,
                                                                 0xFF,
@@ -342,12 +425,13 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
                                                                 IMG_FALSE);
         if (eError != PVRSRV_OK)
         {
+                PVR_DPF((PVR_DBG_ERROR, "SGXScheduleCCBCommand: Timeout waiting for previous command to be read")) ;
                 eError = PVRSRV_ERROR_TIMEOUT;
                 goto Exit;
         }
 #endif
 
-
+        
 
         *psKernelCCB->pui32WriteOffset = (*psKernelCCB->pui32WriteOffset + 1) & 255;
 
@@ -400,6 +484,15 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
 
         OSWriteMemoryBarrier();
 
+        
+        PVR_TTRACE_UI32(PVRSRV_TRACE_GROUP_MKSYNC, PVRSRV_TRACE_CLASS_NONE,
+                        MKSYNC_TOKEN_KERNEL_CCB_OFFSET, *psKernelCCB->pui32WriteOffset);
+        PVR_TTRACE_UI32(PVRSRV_TRACE_GROUP_MKSYNC, PVRSRV_TRACE_CLASS_NONE,
+                        MKSYNC_TOKEN_CORE_CLK, psDevInfo->ui32CoreClockSpeed);
+        PVR_TTRACE_UI32(PVRSRV_TRACE_GROUP_MKSYNC, PVRSRV_TRACE_CLASS_NONE,
+                        MKSYNC_TOKEN_UKERNEL_CLK, psDevInfo->ui32uKernelTimerClock);
+
+
 #if defined(FIX_HW_BRN_26620) && defined(SGX_FEATURE_SYSTEM_CACHE) && !defined(SGX_BYPASS_SYSTEM_CACHE)
         OSWriteHWReg(psDevInfo->pvRegsBaseKM,
                                 SGX_MP_CORE_SELECT(EUR_CR_EVENT_KICK2, 0),
@@ -413,7 +506,7 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_SGXDEV_INFO 	*psDevInfo,
         OSMemoryBarrier();
 
 #if defined(NO_HARDWARE)
-
+        
         *psKernelCCB->pui32ReadOffset = (*psKernelCCB->pui32ReadOffset + 1) & 255;
 #endif
 
@@ -427,10 +520,10 @@ PVRSRV_ERROR SGXScheduleCCBCommandKM(PVRSRV_DEVICE_NODE		*psDeviceNode,
                                                                          SGXMKIF_COMMAND                *psCommandData,
                                                                          IMG_UINT32                             ui32CallerID,
                                                                          IMG_UINT32                             ui32PDumpFlags,
+                                                                         IMG_HANDLE                             hDevMemContext,
                                                                          IMG_BOOL                               bLastInScene)
 {
         PVRSRV_ERROR            eError;
-        PVRSRV_SGXDEV_INFO      *psDevInfo = psDeviceNode->pvDevice;
 
         
         PDUMPSUSPEND();
@@ -474,7 +567,7 @@ PVRSRV_ERROR SGXScheduleCCBCommandKM(PVRSRV_DEVICE_NODE		*psDeviceNode,
                 return eError;
         }
 
-        eError = SGXScheduleCCBCommand(psDevInfo, eCmdType, psCommandData, ui32CallerID, ui32PDumpFlags, bLastInScene);
+        eError = SGXScheduleCCBCommand(psDeviceNode, eCmdType, psCommandData, ui32CallerID, ui32PDumpFlags, hDevMemContext, bLastInScene);
 
         PVRSRVPowerUnlock(ui32CallerID);
 
@@ -496,7 +589,7 @@ PVRSRV_ERROR SGXScheduleProcessQueuesKM(PVRSRV_DEVICE_NODE *psDeviceNode)
         PVRSRV_ERROR            eError;
         PVRSRV_SGXDEV_INFO      *psDevInfo = psDeviceNode->pvDevice;
         SGXMKIF_HOST_CTL        *psHostCtl = psDevInfo->psKernelSGXHostCtlMemInfo->pvLinAddrKM;
-        IMG_UINT32              ui32PowerStatus;
+        IMG_UINT32                      ui32PowerStatus;
         SGXMKIF_COMMAND         sCommand = {0};
 
         ui32PowerStatus = psHostCtl->ui32PowerStatus;
@@ -506,7 +599,7 @@ PVRSRV_ERROR SGXScheduleProcessQueuesKM(PVRSRV_DEVICE_NODE *psDeviceNode)
                 return PVRSRV_OK;
         }
 
-        eError = SGXScheduleCCBCommandKM(psDeviceNode, SGXMKIF_CMD_PROCESS_QUEUES, &sCommand, ISR_ID, 0, IMG_FALSE);
+        eError = SGXScheduleCCBCommandKM(psDeviceNode, SGXMKIF_CMD_PROCESS_QUEUES, &sCommand, ISR_ID, 0, IMG_NULL, IMG_FALSE);
         if (eError != PVRSRV_OK)
         {
                 PVR_DPF((PVR_DBG_ERROR,"SGXScheduleProcessQueuesKM failed to schedule CCB command: %u", eError));
@@ -524,7 +617,11 @@ IMG_BOOL SGXIsDevicePowered(PVRSRV_DEVICE_NODE *psDeviceNode)
 
 IMG_EXPORT
 PVRSRV_ERROR SGXGetInternalDevInfoKM(IMG_HANDLE hDevCookie,
+#if defined (SUPPORT_SID_INTERFACE)
+                                                                        SGX_INTERNAL_DEVINFO_KM *psSGXInternalDevInfo)
+#else
                                                                         SGX_INTERNAL_DEVINFO *psSGXInternalDevInfo)
+#endif
 {
         PVRSRV_SGXDEV_INFO *psDevInfo = (PVRSRV_SGXDEV_INFO *)((PVRSRV_DEVICE_NODE *)hDevCookie)->pvDevice;
 
@@ -544,65 +641,58 @@ IMG_VOID SGXCleanupRequest(PVRSRV_DEVICE_NODE	*psDeviceNode,
                                                    IMG_UINT32                   ui32CleanupType)
 {
         PVRSRV_ERROR                    eError;
-        PVRSRV_SGXDEV_INFO              *psSGXDevInfo = psDeviceNode->pvDevice;
-        PVRSRV_KERNEL_MEM_INFO  *psSGXHostCtlMemInfo = psSGXDevInfo->psKernelSGXHostCtlMemInfo;
-        SGXMKIF_HOST_CTL                *psSGXHostCtl = psSGXHostCtlMemInfo->pvLinAddrKM;
+        PVRSRV_SGXDEV_INFO              *psDevInfo = psDeviceNode->pvDevice;
+        PVRSRV_KERNEL_MEM_INFO  *psHostCtlMemInfo = psDevInfo->psKernelSGXHostCtlMemInfo;
+        SGXMKIF_HOST_CTL                *psHostCtl = psHostCtlMemInfo->pvLinAddrKM;
 
-        if ((psSGXHostCtl->ui32PowerStatus & PVRSRV_USSE_EDM_POWMAN_NO_WORK) != 0)
-        {
-                
-        }
-        else
-        {
-                SGXMKIF_COMMAND         sCommand = {0};
-
-                PDUMPCOMMENTWITHFLAGS(0, "Request ukernel resouce clean-up");
-                sCommand.ui32Data[0] = ui32CleanupType;
-                sCommand.ui32Data[1] = (psHWDataDevVAddr == IMG_NULL) ? 0 : psHWDataDevVAddr->uiAddr;
-
-                eError = SGXScheduleCCBCommandKM(psDeviceNode, SGXMKIF_CMD_CLEANUP, &sCommand, KERNEL_ID, 0, IMG_FALSE);
-                if (eError != PVRSRV_OK)
-                {
-                        PVR_DPF((PVR_DBG_ERROR,"SGXCleanupRequest: Failed to submit clean-up command"));
-                        PVR_DBG_BREAK;
-                }
+        SGXMKIF_COMMAND         sCommand = {0};
 
-                
-                #if !defined(NO_HARDWARE)
-                if(PollForValueKM(&psSGXHostCtl->ui32CleanupStatus,
-                                                  PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE,
-                                                  PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE,
-                                                  10 * MAX_HW_TIME_US,
-                                                  1000,
-                                                  IMG_TRUE) != PVRSRV_OK)
-                {
-                        PVR_DPF((PVR_DBG_ERROR,"SGXCleanupRequest: Wait for uKernel to clean up (%u) failed", ui32CleanupType));
-                        PVR_DBG_BREAK;
-                }
-                #endif
+        sCommand.ui32Data[0] = ui32CleanupType;
+        sCommand.ui32Data[1] = (psHWDataDevVAddr == IMG_NULL) ? 0 : psHWDataDevVAddr->uiAddr;
+        PDUMPCOMMENTWITHFLAGS(0, "Request ukernel resource clean-up, Type %u, Data 0x%X", sCommand.ui32Data[0], sCommand.ui32Data[1]);
 
-                #if defined(PDUMP)
-                
-                PDUMPCOMMENTWITHFLAGS(0, "Host Control - Poll for clean-up request to complete");
-                PDUMPMEMPOL(psSGXHostCtlMemInfo,
-                                        offsetof(SGXMKIF_HOST_CTL, ui32CleanupStatus),
-                                        PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE,
-                                        PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE,
-                                        PDUMP_POLL_OPERATOR_EQUAL,
-                                        0,
-                                        MAKEUNIQUETAG(psSGXHostCtlMemInfo));
-                #endif 
+        eError = SGXScheduleCCBCommandKM(psDeviceNode, SGXMKIF_CMD_CLEANUP, &sCommand, KERNEL_ID, 0, IMG_NULL, IMG_FALSE);
+        if (eError != PVRSRV_OK)
+        {
+                PVR_DPF((PVR_DBG_ERROR,"SGXCleanupRequest: Failed to submit clean-up command"));
+                PVR_DBG_BREAK;
+        }
 
-                psSGXHostCtl->ui32CleanupStatus &= ~(PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE);
-                PDUMPMEM(IMG_NULL, psSGXHostCtlMemInfo, offsetof(SGXMKIF_HOST_CTL, ui32CleanupStatus), sizeof(IMG_UINT32), 0, MAKEUNIQUETAG(psSGXHostCtlMemInfo));
-                
-                
-        #if defined(SGX_FEATURE_SYSTEM_CACHE)
-                psSGXDevInfo->ui32CacheControl |= (SGXMKIF_CC_INVAL_BIF_SL | SGXMKIF_CC_INVAL_DATA);
-        #else
-                psSGXDevInfo->ui32CacheControl |= SGXMKIF_CC_INVAL_DATA;
-        #endif
+        
+        #if !defined(NO_HARDWARE)
+        if(PollForValueKM(&psHostCtl->ui32CleanupStatus,
+                                          PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE,
+                                          PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE,
+                                          10 * MAX_HW_TIME_US,
+                                          1000,
+                                          IMG_TRUE) != PVRSRV_OK)
+        {
+                PVR_DPF((PVR_DBG_ERROR,"SGXCleanupRequest: Wait for uKernel to clean up (%u) failed", ui32CleanupType));
+                PVR_DBG_BREAK;
         }
+        #endif
+
+        #if defined(PDUMP)
+        
+        PDUMPCOMMENTWITHFLAGS(0, "Host Control - Poll for clean-up request to complete");
+        PDUMPMEMPOL(psHostCtlMemInfo,
+                                offsetof(SGXMKIF_HOST_CTL, ui32CleanupStatus),
+                                PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE,
+                                PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE,
+                                PDUMP_POLL_OPERATOR_EQUAL,
+                                0,
+                                MAKEUNIQUETAG(psHostCtlMemInfo));
+        #endif 
+
+        psHostCtl->ui32CleanupStatus &= ~(PVRSRV_USSE_EDM_CLEANUPCMD_COMPLETE);
+        PDUMPMEM(IMG_NULL, psHostCtlMemInfo, offsetof(SGXMKIF_HOST_CTL, ui32CleanupStatus), sizeof(IMG_UINT32), 0, MAKEUNIQUETAG(psHostCtlMemInfo));
+        
+        
+#if defined(SGX_FEATURE_SYSTEM_CACHE)
+        psDevInfo->ui32CacheControl |= (SGXMKIF_CC_INVAL_BIF_SL | SGXMKIF_CC_INVAL_DATA);
+#else
+        psDevInfo->ui32CacheControl |= SGXMKIF_CC_INVAL_DATA;
+#endif
 }
 
 
@@ -1018,3 +1108,40 @@ IMG_UINT32 SGXConvertTimeStamp(PVRSRV_SGXDEV_INFO	*psDevInfo,
 
 
 
+IMG_EXPORT
+PVRSRV_ERROR PVRSRVGetSGXRevDataKM(PVRSRV_DEVICE_NODE* psDeviceNode, IMG_UINT32 *pui32SGXCoreRev,
+                                IMG_UINT32 *pui32SGXCoreID)
+{
+        PVRSRV_SGXDEV_INFO *psDevInfo = (PVRSRV_SGXDEV_INFO *)psDeviceNode->pvDevice;
+        SGX_MISC_INFO sMiscInfo;
+        PVRSRV_ERROR eError;
+
+        sMiscInfo.eRequest = SGX_MISC_INFO_REQUEST_SGXREV;
+        eError = SGXGetMiscInfoKM(psDevInfo, &sMiscInfo, psDeviceNode, NULL);
+
+        *pui32SGXCoreRev = sMiscInfo.uData.sSGXFeatures.ui32CoreRev;
+        *pui32SGXCoreID = sMiscInfo.uData.sSGXFeatures.ui32CoreID;
+        return eError;
+}
+
+
+PVRSRV_ERROR SGXContextSuspend(PVRSRV_DEVICE_NODE       *psDeviceNode,
+                                                           IMG_DEV_VIRTADDR             *psHWContextDevVAddr,
+                                                           IMG_BOOL                             bResume)
+{
+        PVRSRV_ERROR            eError;
+        SGXMKIF_COMMAND         sCommand = {0};
+
+        sCommand.ui32Data[0] = psHWContextDevVAddr->uiAddr;
+        sCommand.ui32Data[1] = bResume ? PVRSRV_CTXSUSPCMD_RESUME : PVRSRV_CTXSUSPCMD_SUSPEND;
+
+        eError = SGXScheduleCCBCommandKM(psDeviceNode, SGXMKIF_CMD_CONTEXTSUSPEND, &sCommand, KERNEL_ID, 0, IMG_NULL, IMG_FALSE);
+        if (eError != PVRSRV_OK)
+        {
+                PVR_DPF((PVR_DBG_ERROR,"SGXContextSuspend: Failed to submit context suspend command"));
+                return eError;
+        }
+        
+        return eError;
+}
+