1 files changed, 56 insertions, 63 deletions

diff --git a/drivers/gpu/pvr/deviceclass.c b/drivers/gpu/pvr/deviceclass.c
index 471ce0cf12b..effcdfbf055 100644
--- a/drivers/gpu/pvr/deviceclass.c
+++ b/drivers/gpu/pvr/deviceclass.c
@@ -557,6 +557,17 @@ static PVRSRV_ERROR CloseDCDeviceCallBack(IMG_PVOID		pvParam,
         psDCPerContextInfo = (PVRSRV_DISPLAYCLASS_PERCONTEXT_INFO *)pvParam;
         psDCInfo = psDCPerContextInfo->psDCInfo;
 
+        if(psDCInfo->sSystemBuffer.sDeviceClassBuffer.ui32MemMapRefCount != 0)
+        {
+                PVR_DPF((PVR_DBG_ERROR,"CloseDCDeviceCallBack: system buffer (0x%p) still mapped (refcount = %d)",
+                                &psDCInfo->sSystemBuffer.sDeviceClassBuffer,
+                                psDCInfo->sSystemBuffer.sDeviceClassBuffer.ui32MemMapRefCount));
+#if 0
+                
+                return PVRSRV_ERROR_STILL_MAPPED;
+#endif
+        }
+
         psDCInfo->ui32RefCount--;
         if(psDCInfo->ui32RefCount == 0)
         {
@@ -658,6 +669,7 @@ PVRSRV_ERROR PVRSRVOpenDCDeviceKM (PVRSRV_PER_PROCESS_DATA	*psPerProc,
                 }
 
                 psDCInfo->sSystemBuffer.sDeviceClassBuffer.psKernelSyncInfo->ui32RefCount++;
+                psDCInfo->sSystemBuffer.sDeviceClassBuffer.ui32MemMapRefCount = 0;
         }
 
         psDCPerContextInfo->psDCInfo = psDCInfo;
@@ -812,7 +824,6 @@ static PVRSRV_ERROR DestroyDCSwapChain(PVRSRV_DC_SWAPCHAIN *psSwapChain)
         PVRSRV_DISPLAYCLASS_INFO        *psDCInfo = psSwapChain->psDCInfo;
         IMG_UINT32 i;
 
-
         
         if( psDCInfo->psDCSwapChainShared )
         {
@@ -873,9 +884,24 @@ static PVRSRV_ERROR DestroyDCSwapChainRefCallBack(IMG_PVOID pvParam, IMG_UINT32
 {
         PVRSRV_DC_SWAPCHAIN_REF *psSwapChainRef = (PVRSRV_DC_SWAPCHAIN_REF *) pvParam;
         PVRSRV_ERROR eError = PVRSRV_OK;
+        IMG_UINT32 i;
 
         PVR_UNREFERENCED_PARAMETER(ui32Param);
 
+        for (i = 0; i < psSwapChainRef->psSwapChain->ui32BufferCount; i++)
+        {
+                if (psSwapChainRef->psSwapChain->asBuffer[i].sDeviceClassBuffer.ui32MemMapRefCount != 0)
+                {
+                        PVR_DPF((PVR_DBG_ERROR, "DestroyDCSwapChainRefCallBack: swapchain (0x%p) still mapped (ui32MemMapRefCount = %d)",
+                                        &psSwapChainRef->psSwapChain->asBuffer[i].sDeviceClassBuffer,
+                                        psSwapChainRef->psSwapChain->asBuffer[i].sDeviceClassBuffer.ui32MemMapRefCount));
+#if 0
+                        
+                        return PVRSRV_ERROR_STILL_MAPPED;
+#endif
+                }
+        }
+
         if(--psSwapChainRef->psSwapChain->ui32RefCount == 0) 
         {
                 eError = DestroyDCSwapChain(psSwapChainRef->psSwapChain);
@@ -1313,6 +1339,7 @@ PVRSRV_ERROR PVRSRVSwapToDCBufferKM(IMG_HANDLE	hDeviceKM,
         IMG_UINT32 ui32NumSrcSyncs = 1;
         PVRSRV_KERNEL_SYNC_INFO *apsSrcSync[2];
         PVRSRV_COMMAND *psCommand;
+        SYS_DATA *psSysData;
 
         if(!hDeviceKM || !hBuffer || !psClipRect)
         {
@@ -1320,14 +1347,6 @@ PVRSRV_ERROR PVRSRVSwapToDCBufferKM(IMG_HANDLE	hDeviceKM,
                 return PVRSRV_ERROR_INVALID_PARAMS;
         }
 
-#if defined(SUPPORT_LMA)
-        eError = PVRSRVPowerLock(KERNEL_ID, IMG_FALSE);
-        if(eError != PVRSRV_OK)
-        {
-                return eError;
-        }
-#endif 
-
         psBuffer = (PVRSRV_DC_BUFFER*)hBuffer;
         psDCInfo = DCDeviceHandleToDCInfo(hDeviceKM);
 
@@ -1427,28 +1446,15 @@ PVRSRV_ERROR PVRSRVSwapToDCBufferKM(IMG_HANDLE	hDeviceKM,
 
         
 
+        SysAcquireData(&psSysData);
+    eError = OSScheduleMISR(psSysData);
 
-
-
-
-
-
-         
-        LOOP_UNTIL_TIMEOUT(MAX_HW_TIME_US)
+        if (eError != PVRSRV_OK)
         {
-                if(PVRSRVProcessQueues(KERNEL_ID, IMG_FALSE) != PVRSRV_ERROR_PROCESSING_BLOCKED)
-                {
-                        goto ProcessedQueues;
-                }
-                OSWaitus(MAX_HW_TIME_US/WAIT_TRY_COUNT);
-        } END_LOOP_UNTIL_TIMEOUT();
-
-        PVR_DPF((PVR_DBG_ERROR,"PVRSRVSwapToDCBufferKM: Failed to process queues"));
-
-        eError = PVRSRV_ERROR_FAILED_TO_PROCESS_QUEUE;
-        goto Exit;
+                PVR_DPF((PVR_DBG_ERROR,"PVRSRVSwapToDCBufferKM: Failed to schedule MISR"));
+                goto Exit;
+        }
 
-ProcessedQueues:
         
         psBuffer->psSwapChain->psLastFlipBuffer = psBuffer;
 
@@ -1459,9 +1465,6 @@ Exit:
                 eError = PVRSRV_ERROR_RETRY;
         }
 
-#if defined(SUPPORT_LMA)
-        PVRSRVPowerUnlock(KERNEL_ID);
-#endif
         return eError;
 }
 
@@ -1481,6 +1484,7 @@ PVRSRV_ERROR PVRSRVSwapToDCSystemKM(IMG_HANDLE	hDeviceKM,
         PVRSRV_COMMAND *psCommand;
         IMG_BOOL bAddReferenceToLast = IMG_TRUE;
         IMG_UINT16 ui16SwapCommandID = DC_FLIP_COMMAND;
+    SYS_DATA *psSysData;
 
         if(!hDeviceKM || !hSwapChainRef)
         {
@@ -1488,14 +1492,6 @@ PVRSRV_ERROR PVRSRVSwapToDCSystemKM(IMG_HANDLE	hDeviceKM,
                 return PVRSRV_ERROR_INVALID_PARAMS;
         }
 
-#if defined(SUPPORT_LMA)
-        eError = PVRSRVPowerLock(KERNEL_ID, IMG_FALSE);
-        if(eError != PVRSRV_OK)
-        {
-                return eError;
-        }
-#endif 
-
         psDCInfo = DCDeviceHandleToDCInfo(hDeviceKM);
         psSwapChainRef = (PVRSRV_DC_SWAPCHAIN_REF*)hSwapChainRef;
         psSwapChain = psSwapChainRef->psSwapChain;
@@ -1581,28 +1577,15 @@ PVRSRV_ERROR PVRSRVSwapToDCSystemKM(IMG_HANDLE	hDeviceKM,
         }
 
         
+        SysAcquireData(&psSysData);
+    eError = OSScheduleMISR(psSysData);
 
-
-
-
-
-
-         
-        LOOP_UNTIL_TIMEOUT(MAX_HW_TIME_US)
+        if (eError != PVRSRV_OK)
         {
-                if(PVRSRVProcessQueues(KERNEL_ID, IMG_FALSE) != PVRSRV_ERROR_PROCESSING_BLOCKED)
-                {
-                        goto ProcessedQueues;
-                }
-
-                OSWaitus(MAX_HW_TIME_US/WAIT_TRY_COUNT);
-        } END_LOOP_UNTIL_TIMEOUT();
-
-        PVR_DPF((PVR_DBG_ERROR,"PVRSRVSwapToDCSystemKM: Failed to process queues"));
-        eError = PVRSRV_ERROR_FAILED_TO_PROCESS_QUEUE;
-        goto Exit;
+                PVR_DPF((PVR_DBG_ERROR,"PVRSRVSwapToDCSystemKM: Failed to schedule MISR"));
+                goto Exit;
+        }
 
-ProcessedQueues:
         
         psSwapChain->psLastFlipBuffer = &psDCInfo->sSystemBuffer;
 
@@ -1615,9 +1598,6 @@ Exit:
                 eError = PVRSRV_ERROR_RETRY;
         }
 
-#if defined(SUPPORT_LMA)
-        PVRSRVPowerUnlock(KERNEL_ID);
-#endif
         return eError;
 }
 
@@ -1736,17 +1716,29 @@ static PVRSRV_ERROR CloseBCDeviceCallBack(IMG_PVOID		pvParam,
 {
         PVRSRV_BUFFERCLASS_PERCONTEXT_INFO *psBCPerContextInfo;
         PVRSRV_BUFFERCLASS_INFO *psBCInfo;
+        IMG_UINT32 i;
 
         PVR_UNREFERENCED_PARAMETER(ui32Param);
 
         psBCPerContextInfo = (PVRSRV_BUFFERCLASS_PERCONTEXT_INFO *)pvParam;
+
         psBCInfo = psBCPerContextInfo->psBCInfo;
 
+        for (i = 0; i < psBCInfo->ui32BufferCount; i++)
+        {
+                if (psBCInfo->psBuffer[i].sDeviceClassBuffer.ui32MemMapRefCount != 0)
+                {
+                        PVR_DPF((PVR_DBG_ERROR, "CloseBCDeviceCallBack: buffer %d (0x%p) still mapped (ui32MemMapRefCount = %d)",
+                                        i,
+                                        &psBCInfo->psBuffer[i].sDeviceClassBuffer,
+                                        psBCInfo->psBuffer[i].sDeviceClassBuffer.ui32MemMapRefCount));
+                        return PVRSRV_ERROR_STILL_MAPPED;
+                }
+        }
+
         psBCInfo->ui32RefCount--;
         if(psBCInfo->ui32RefCount == 0)
         {
-                IMG_UINT32 i;
-
                 
                 psBCInfo->psFuncTable->pfnCloseBCDevice(psBCInfo->ui32DeviceID, psBCInfo->hExtDevice);
 
@@ -1900,6 +1892,7 @@ PVRSRV_ERROR PVRSRVOpenBCDeviceKM (PVRSRV_PER_PROCESS_DATA	*psPerProc,
                         psBCInfo->psBuffer[i].sDeviceClassBuffer.pfnGetBufferAddr = psBCInfo->psFuncTable->pfnGetBufferAddr;
                         psBCInfo->psBuffer[i].sDeviceClassBuffer.hDevMemContext = psBCInfo->hDevMemContext;
                         psBCInfo->psBuffer[i].sDeviceClassBuffer.hExtDevice = psBCInfo->hExtDevice;
+                        psBCInfo->psBuffer[i].sDeviceClassBuffer.ui32MemMapRefCount = 0;
                 }
         }