diff options
| author | Ben Jones <ben.jones@imgtec.com> | 2011-08-02 17:40:38 +0100 |
|---|---|---|
| committer | Ben Jones <ben.jones@imgtec.com> | 2011-08-02 17:40:38 +0100 |
| commit | f5f63efcc08ad67b25dfc7e20f99ebff8c499854 (patch) | |
| tree | 65b60cad1e832bdd2ebfa8a68b4d525b33126235 | |
| parent | 3cc95e30e5cd54c8e0d968993c1b9f4dcae5d544 (diff) | |
| download | samsung-android-samsung-2.6.35-gingerbread.tar.gz | |
gpu: pvr: Update to DDK 1.6.16.4131.1.1android-samsung-2.6.35-gingerbread
Includes some fixes for IPGear 14355.
| -rw-r--r-- | drivers/gpu/pvr/bridged_pvr_bridge.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/pvr/buffer_manager.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/pvr/pvrversion.h | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/drivers/gpu/pvr/bridged_pvr_bridge.c b/drivers/gpu/pvr/bridged_pvr_bridge.c index b727ed93b7c..71aa71c567e 100644 --- a/drivers/gpu/pvr/bridged_pvr_bridge.c +++ b/drivers/gpu/pvr/bridged_pvr_bridge.c @@ -3827,10 +3827,12 @@ IMG_INT BridgedDispatchKM(PVRSRV_PER_PROCESS_DATA * psPerProc, psBridgeOut = (IMG_PVOID)((IMG_PBYTE)psBridgeIn + PVRSRV_MAX_BRIDGE_IN_SIZE); -#if defined(DEBUG) - PVR_ASSERT(psBridgePackageKM->ui32InBufferSize < PVRSRV_MAX_BRIDGE_IN_SIZE); - PVR_ASSERT(psBridgePackageKM->ui32OutBufferSize < PVRSRV_MAX_BRIDGE_OUT_SIZE); -#endif + if((psBridgePackageKM->ui32InBufferSize > PVRSRV_MAX_BRIDGE_IN_SIZE) || + (psBridgePackageKM->ui32OutBufferSize > PVRSRV_MAX_BRIDGE_OUT_SIZE)) + { + goto return_fault; + } + if(psBridgePackageKM->ui32InBufferSize > 0) { diff --git a/drivers/gpu/pvr/buffer_manager.c b/drivers/gpu/pvr/buffer_manager.c index c5ee8c79496..854fbef9d38 100644 --- a/drivers/gpu/pvr/buffer_manager.c +++ b/drivers/gpu/pvr/buffer_manager.c @@ -895,9 +895,9 @@ BM_CreateContext(PVRSRV_DEVICE_NODE *psDeviceNode, goto cleanup; } - if(psDeviceNode->pfnMMUInitialise(psDeviceNode, - &pBMContext->psMMUContext, - psPDDevPAddr) != PVRSRV_OK) + if((IMG_NULL == psDeviceNode->pfnMMUInitialise) || (psDeviceNode->pfnMMUInitialise(psDeviceNode, + &pBMContext->psMMUContext, + psPDDevPAddr) != PVRSRV_OK)) { PVR_DPF((PVR_DBG_ERROR, "BM_CreateContext: MMUInitialise failed")); goto cleanup; diff --git a/drivers/gpu/pvr/pvrversion.h b/drivers/gpu/pvr/pvrversion.h index d31de49abdb..e80487f6d55 100644 --- a/drivers/gpu/pvr/pvrversion.h +++ b/drivers/gpu/pvr/pvrversion.h @@ -31,7 +31,7 @@ #define PVRVERSION_MIN 6 #define PVRVERSION_BRANCH 16 #define PVRVERSION_BUILD 4131 -#define PVRVERSION_STRING "1.6.16.4131" +#define PVRVERSION_STRING "1.6.16.4131.1.1" #define PVRVERSION_FILE "eurasiacon.pj" #endif |