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, 10 insertions, 13 deletions

diff --git a/drivers/gpu/pvr/resman.c b/drivers/gpu/pvr/resman.c
index 5230952be84..b3a4534c809 100644
--- a/drivers/gpu/pvr/resman.c
+++ b/drivers/gpu/pvr/resman.c
@@ -122,7 +122,7 @@ static IMPLEMENT_LIST_INSERT(RESMAN_CONTEXT)
 
 #define PRINT_RESLIST(x, y, z)
 
-static PVRSRV_ERROR FreeResourceByPtr(RESMAN_ITEM *psItem, IMG_BOOL bExecuteCallback);
+static PVRSRV_ERROR FreeResourceByPtr(RESMAN_ITEM *psItem, IMG_BOOL bExecuteCallback, IMG_BOOL bForceCleanup);
 
 static PVRSRV_ERROR FreeResourceByCriteria(PRESMAN_CONTEXT      psContext,
                                                                                    IMG_UINT32           ui32SearchCriteria,
@@ -379,7 +379,7 @@ PRESMAN_ITEM ResManRegisterRes(PRESMAN_CONTEXT	psResManContext,
         return(psNewResItem);
 }
 
-PVRSRV_ERROR ResManFreeResByPtr(RESMAN_ITEM     *psResItem)
+PVRSRV_ERROR ResManFreeResByPtr(RESMAN_ITEM     *psResItem, IMG_BOOL bForceCleanup)
 {
         PVRSRV_ERROR eError;
 
@@ -401,7 +401,7 @@ PVRSRV_ERROR ResManFreeResByPtr(RESMAN_ITEM	*psResItem)
         VALIDATERESLIST();
 
         
-        eError = FreeResourceByPtr(psResItem, IMG_TRUE);
+        eError = FreeResourceByPtr(psResItem, IMG_TRUE, bForceCleanup);
 
         
         VALIDATERESLIST();
@@ -478,7 +478,7 @@ PVRSRV_ERROR ResManDissociateRes(RESMAN_ITEM		*psResItem,
         }
         else
         {
-                eError = FreeResourceByPtr(psResItem, IMG_FALSE);
+                eError = FreeResourceByPtr(psResItem, IMG_FALSE, CLEANUP_WITH_POLL);
                 if(eError != PVRSRV_OK)
                 {
                         PVR_DPF((PVR_DBG_ERROR, "ResManDissociateRes: failed to free resource by pointer"));
@@ -554,9 +554,10 @@ IMG_INTERNAL PVRSRV_ERROR ResManFindResourceByPtr(PRESMAN_CONTEXT	psResManContex
 }
 
 static PVRSRV_ERROR FreeResourceByPtr(RESMAN_ITEM       *psItem,
-                                                                          IMG_BOOL              bExecuteCallback)
+                                                                          IMG_BOOL              bExecuteCallback,
+                                                                          IMG_BOOL              bForceCleanup)
 {
-        PVRSRV_ERROR eError;
+        PVRSRV_ERROR eError = PVRSRV_OK;
 
         PVR_ASSERT(psItem != IMG_NULL);
 
@@ -591,7 +592,7 @@ static PVRSRV_ERROR FreeResourceByPtr(RESMAN_ITEM	*psItem,
         
         if (bExecuteCallback)
         {
-                eError = psItem->pfnFreeResource(psItem->pvParam, psItem->ui32Param);
+                eError = psItem->pfnFreeResource(psItem->pvParam, psItem->ui32Param, bForceCleanup);
                 if (eError != PVRSRV_OK)
                 {
                         PVR_DPF((PVR_DBG_ERROR, "FreeResourceByPtr: ERROR calling FreeResource function"));
@@ -602,11 +603,7 @@ static PVRSRV_ERROR FreeResourceByPtr(RESMAN_ITEM	*psItem,
         ACQUIRE_SYNC_OBJ;
 
         
-        eError = OSFreeMem(PVRSRV_OS_PAGEABLE_HEAP, sizeof(RESMAN_ITEM), psItem, IMG_NULL);
-        if (eError != PVRSRV_OK)
-        {
-                PVR_DPF((PVR_DBG_ERROR, "FreeResourceByPtr: ERROR freeing resource list item memory"));
-        }
+        OSFreeMem(PVRSRV_OS_PAGEABLE_HEAP, sizeof(RESMAN_ITEM), psItem, IMG_NULL);
 
         return(eError);
 }
@@ -667,7 +664,7 @@ static PVRSRV_ERROR FreeResourceByCriteria(PRESMAN_CONTEXT	psResManContext,
                                                                                 ui32Param)) != IMG_NULL
                         && eError == PVRSRV_OK)
         {
-                eError = FreeResourceByPtr(psCurItem, bExecuteCallback);
+                eError = FreeResourceByPtr(psCurItem, bExecuteCallback, CLEANUP_WITH_POLL);
         }
 
         return eError;