OMAP4: SGX-KM: Upgrade DDK to version 1.7.17.4403

This patch upgrades the kernel side graphics driver to version
1.7.17.4403.

The corresponding change in the user side must be in place for this
to work.

Change-Id: Id3a713fa22a227dbcd0ec098589d62b350802247
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>

1 files changed, 90 insertions, 64 deletions

diff --git a/drivers/gpu/pvr/sgx/sgxutils.c b/drivers/gpu/pvr/sgx/sgxutils.c
index cf7ecc68d93..75b1b893200 100644
--- a/drivers/gpu/pvr/sgx/sgxutils.c
+++ b/drivers/gpu/pvr/sgx/sgxutils.c
@@ -206,7 +206,7 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_DEVICE_NODE	*psDeviceNode,
 
 
 
-        if ( (eCmdType != SGXMKIF_CMD_PROCESS_QUEUES) && 
+        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))
         {
@@ -227,7 +227,7 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_DEVICE_NODE	*psDeviceNode,
                 {
                         goto Exit;
                 }
-                
+
                 
                 #if !defined(NO_HARDWARE)
                 if(PollForValueKM(&psSGXHostCtl->ui32InvalStatus,
@@ -241,7 +241,7 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_DEVICE_NODE	*psDeviceNode,
                         PVR_DBG_BREAK;
                 }
                 #endif
-        
+
                 #if defined(PDUMP)
                 
                 PDUMPCOMMENTWITHFLAGS(0, "Host Control - Poll for BIF cache invalidate request to complete");
@@ -253,14 +253,14 @@ PVRSRV_ERROR SGXScheduleCCBCommand(PVRSRV_DEVICE_NODE	*psDeviceNode,
                                         0,
                                         MAKEUNIQUETAG(psSGXHostCtlMemInfo));
                 #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 
+#else
         PVR_UNREFERENCED_PARAMETER(hDevMemContext);
 #endif
-        
+
 #if defined(FIX_HW_BRN_31620)
         if ((eCmdType != SGXMKIF_CMD_FLUSHPDCACHE) && (psDevInfo->ui32CacheControl & SGXMKIF_CC_INVAL_BIF_PD))
         {
@@ -636,9 +636,10 @@ PVRSRV_ERROR SGXGetInternalDevInfoKM(IMG_HANDLE hDevCookie,
 }
 
 
-IMG_VOID SGXCleanupRequest(PVRSRV_DEVICE_NODE   *psDeviceNode,
-                                                   IMG_DEV_VIRTADDR             *psHWDataDevVAddr,
-                                                   IMG_UINT32                   ui32CleanupType)
+PVRSRV_ERROR SGXCleanupRequest(PVRSRV_DEVICE_NODE *psDeviceNode,
+                                                           IMG_DEV_VIRTADDR   *psHWDataDevVAddr,
+                                                           IMG_UINT32          ui32CleanupType,
+                                                           IMG_BOOL            bForceCleanup)
 {
         PVRSRV_ERROR                    eError;
         PVRSRV_SGXDEV_INFO              *psDevInfo = psDeviceNode->pvDevice;
@@ -647,52 +648,64 @@ IMG_VOID SGXCleanupRequest(PVRSRV_DEVICE_NODE	*psDeviceNode,
 
         SGXMKIF_COMMAND         sCommand = {0};
 
-        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]);
 
-        eError = SGXScheduleCCBCommandKM(psDeviceNode, SGXMKIF_CMD_CLEANUP, &sCommand, KERNEL_ID, 0, IMG_NULL, IMG_FALSE);
-        if (eError != PVRSRV_OK)
+        if (bForceCleanup != FORCE_CLEANUP)
         {
-                PVR_DPF((PVR_DBG_ERROR,"SGXCleanupRequest: Failed to submit clean-up command"));
-                PVR_DBG_BREAK;
-        }
-
+                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(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
+                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;
+                                return eError;
+                }
 
-        #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 
 
+                #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));
+                        eError = PVRSRV_ERROR_TIMEOUT;
+                        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
+
+                if (eError != PVRSRV_OK)
+                {
+                        return eError;
+                }
+        }
+        
         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
+        return PVRSRV_OK;
 }
 
 
@@ -706,15 +719,18 @@ typedef struct _SGX_HW_RENDER_CONTEXT_CLEANUP_
 
 
 static PVRSRV_ERROR SGXCleanupHWRenderContextCallback(IMG_PVOID         pvParam,
-                                                                                                          IMG_UINT32    ui32Param)
+                                                                                                          IMG_UINT32    ui32Param,
+                                                                                                          IMG_BOOL              bForceCleanup)
 {
+        PVRSRV_ERROR eError;
         SGX_HW_RENDER_CONTEXT_CLEANUP *psCleanup = pvParam;
 
         PVR_UNREFERENCED_PARAMETER(ui32Param);
 
-        SGXCleanupRequest(psCleanup->psDeviceNode,
+        eError = SGXCleanupRequest(psCleanup->psDeviceNode,
                                           &psCleanup->sHWRenderContextDevVAddr,
-                                          PVRSRV_CLEANUPCMD_RC);
+                                          PVRSRV_CLEANUPCMD_RC,
+                                          bForceCleanup);
 
         OSFreeMem(PVRSRV_OS_PAGEABLE_HEAP,
                           sizeof(SGX_HW_RENDER_CONTEXT_CLEANUP),
@@ -722,7 +738,7 @@ static PVRSRV_ERROR SGXCleanupHWRenderContextCallback(IMG_PVOID		pvParam,
                           psCleanup->hBlockAlloc);
         
 
-        return PVRSRV_OK;
+        return eError;
 }
 
 typedef struct _SGX_HW_TRANSFER_CONTEXT_CLEANUP_
@@ -735,15 +751,18 @@ typedef struct _SGX_HW_TRANSFER_CONTEXT_CLEANUP_
 
 
 static PVRSRV_ERROR SGXCleanupHWTransferContextCallback(IMG_PVOID       pvParam,
-                                                                                                                IMG_UINT32      ui32Param)
+                                                                                                                IMG_UINT32      ui32Param,
+                                                                                                                IMG_BOOL        bForceCleanup)
 {
+        PVRSRV_ERROR eError;
         SGX_HW_TRANSFER_CONTEXT_CLEANUP *psCleanup = (SGX_HW_TRANSFER_CONTEXT_CLEANUP *)pvParam;
 
         PVR_UNREFERENCED_PARAMETER(ui32Param);
 
-        SGXCleanupRequest(psCleanup->psDeviceNode,
+        eError = SGXCleanupRequest(psCleanup->psDeviceNode,
                                           &psCleanup->sHWTransferContextDevVAddr,
-                                          PVRSRV_CLEANUPCMD_TC);
+                                          PVRSRV_CLEANUPCMD_TC,
+                                          bForceCleanup);
 
         OSFreeMem(PVRSRV_OS_PAGEABLE_HEAP,
                           sizeof(SGX_HW_TRANSFER_CONTEXT_CLEANUP),
@@ -751,7 +770,7 @@ static PVRSRV_ERROR SGXCleanupHWTransferContextCallback(IMG_PVOID	pvParam,
                           psCleanup->hBlockAlloc);
         
 
-        return PVRSRV_OK;
+        return eError;
 }
 
 IMG_EXPORT
@@ -804,7 +823,7 @@ IMG_HANDLE SGXRegisterHWRenderContextKM(IMG_HANDLE				psDeviceNode,
 }
 
 IMG_EXPORT
-PVRSRV_ERROR SGXUnregisterHWRenderContextKM(IMG_HANDLE hHWRenderContext)
+PVRSRV_ERROR SGXUnregisterHWRenderContextKM(IMG_HANDLE hHWRenderContext, IMG_BOOL bForceCleanup)
 {
         PVRSRV_ERROR eError;
         SGX_HW_RENDER_CONTEXT_CLEANUP *psCleanup;
@@ -819,7 +838,7 @@ PVRSRV_ERROR SGXUnregisterHWRenderContextKM(IMG_HANDLE hHWRenderContext)
                 return PVRSRV_ERROR_INVALID_PARAMS;
         }
 
-        eError = ResManFreeResByPtr(psCleanup->psResItem);
+        eError = ResManFreeResByPtr(psCleanup->psResItem, bForceCleanup);
 
         return eError;
 }
@@ -875,7 +894,7 @@ IMG_HANDLE SGXRegisterHWTransferContextKM(IMG_HANDLE				psDeviceNode,
 }
 
 IMG_EXPORT
-PVRSRV_ERROR SGXUnregisterHWTransferContextKM(IMG_HANDLE hHWTransferContext)
+PVRSRV_ERROR SGXUnregisterHWTransferContextKM(IMG_HANDLE hHWTransferContext, IMG_BOOL bForceCleanup)
 {
         PVRSRV_ERROR eError;
         SGX_HW_TRANSFER_CONTEXT_CLEANUP *psCleanup;
@@ -890,7 +909,7 @@ PVRSRV_ERROR SGXUnregisterHWTransferContextKM(IMG_HANDLE hHWTransferContext)
                 return PVRSRV_ERROR_INVALID_PARAMS;
         }
 
-        eError = ResManFreeResByPtr(psCleanup->psResItem);
+        eError = ResManFreeResByPtr(psCleanup->psResItem, bForceCleanup);
 
         return eError;
 }
@@ -904,15 +923,19 @@ typedef struct _SGX_HW_2D_CONTEXT_CLEANUP_
         PRESMAN_ITEM psResItem;
 } SGX_HW_2D_CONTEXT_CLEANUP;
 
-static PVRSRV_ERROR SGXCleanupHW2DContextCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param)
+static PVRSRV_ERROR SGXCleanupHW2DContextCallback(IMG_PVOID  pvParam,
+                                                                                                  IMG_UINT32 ui32Param,
+                                                                                                  IMG_BOOL   bForceCleanup)
 {
+        PVRSRV_ERROR eError;
         SGX_HW_2D_CONTEXT_CLEANUP *psCleanup = (SGX_HW_2D_CONTEXT_CLEANUP *)pvParam;
 
         PVR_UNREFERENCED_PARAMETER(ui32Param);
 
-        SGXCleanupRequest(psCleanup->psDeviceNode,
+        eError = SGXCleanupRequest(psCleanup->psDeviceNode,
                                           &psCleanup->sHW2DContextDevVAddr,
-                                          PVRSRV_CLEANUPCMD_2DC);
+                                          PVRSRV_CLEANUPCMD_2DC,
+                                          bForceCleanup);
 
         OSFreeMem(PVRSRV_OS_PAGEABLE_HEAP,
                           sizeof(SGX_HW_2D_CONTEXT_CLEANUP),
@@ -920,7 +943,7 @@ static PVRSRV_ERROR SGXCleanupHW2DContextCallback(IMG_PVOID pvParam, IMG_UINT32
                           psCleanup->hBlockAlloc);
         
 
-        return PVRSRV_OK;
+        return eError;
 }
 
 IMG_EXPORT
@@ -973,7 +996,7 @@ IMG_HANDLE SGXRegisterHW2DContextKM(IMG_HANDLE				psDeviceNode,
 }
 
 IMG_EXPORT
-PVRSRV_ERROR SGXUnregisterHW2DContextKM(IMG_HANDLE hHW2DContext)
+PVRSRV_ERROR SGXUnregisterHW2DContextKM(IMG_HANDLE hHW2DContext, IMG_BOOL bForceCleanup)
 {
         PVRSRV_ERROR eError;
         SGX_HW_2D_CONTEXT_CLEANUP *psCleanup;
@@ -987,7 +1010,7 @@ PVRSRV_ERROR SGXUnregisterHW2DContextKM(IMG_HANDLE hHW2DContext)
 
         psCleanup = (SGX_HW_2D_CONTEXT_CLEANUP *)hHW2DContext;
 
-        eError = ResManFreeResByPtr(psCleanup->psResItem);
+        eError = ResManFreeResByPtr(psCleanup->psResItem, bForceCleanup);
 
         return eError;
 }
@@ -1076,13 +1099,16 @@ PVRSRV_ERROR SGX2DQueryBlitsCompleteKM(PVRSRV_SGXDEV_INFO	*psDevInfo,
 
 
 IMG_EXPORT
-IMG_VOID SGXFlushHWRenderTargetKM(IMG_HANDLE psDeviceNode, IMG_DEV_VIRTADDR sHWRTDataSetDevVAddr)
+PVRSRV_ERROR SGXFlushHWRenderTargetKM(IMG_HANDLE psDeviceNode,
+                                                                          IMG_DEV_VIRTADDR sHWRTDataSetDevVAddr,
+                                                                          IMG_BOOL bForceCleanup)
 {
         PVR_ASSERT(sHWRTDataSetDevVAddr.uiAddr != IMG_NULL);
 
-        SGXCleanupRequest(psDeviceNode,
+        return SGXCleanupRequest(psDeviceNode,
                                           &sHWRTDataSetDevVAddr,
-                                          PVRSRV_CLEANUPCMD_RT);
+                                          PVRSRV_CLEANUPCMD_RT,
+                                          bForceCleanup);
 }
 
 
@@ -1141,7 +1167,7 @@ PVRSRV_ERROR SGXContextSuspend(PVRSRV_DEVICE_NODE	*psDeviceNode,
                 PVR_DPF((PVR_DBG_ERROR,"SGXContextSuspend: Failed to submit context suspend command"));
                 return eError;
         }
-        
+
         return eError;
 }