diff options
| author | Hemant Hariyani <hemanthariyani@ti.com> | 2010-10-13 23:28:30 -0500 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:06:44 -0700 |
| commit | e58b2f41d772049fecdeb0c2ed8e9b369ed21833 (patch) | |
| tree | 23132aa01f33dc797836b4a051d9dbd120f0cf70 /drivers/gpu/pvr/bridged_pvr_bridge.c | |
| parent | 2e2e18b393f7b93681beec62d03b607274907c1c (diff) | |
| download | kernel_samsung_tuna-e58b2f41d772049fecdeb0c2ed8e9b369ed21833.zip kernel_samsung_tuna-e58b2f41d772049fecdeb0c2ed8e9b369ed21833.tar.gz kernel_samsung_tuna-e58b2f41d772049fecdeb0c2ed8e9b369ed21833.tar.bz2 | |
SGX-KM: Upgrading to DDK 1.6.16.3924
Upgrading kernel side DDK to version 1.6.16.3924.
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
Diffstat (limited to 'drivers/gpu/pvr/bridged_pvr_bridge.c')
| -rw-r--r-- | drivers/gpu/pvr/bridged_pvr_bridge.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/bridged_pvr_bridge.c b/drivers/gpu/pvr/bridged_pvr_bridge.c index 2b6cb48..7677329 100644 --- a/drivers/gpu/pvr/bridged_pvr_bridge.c +++ b/drivers/gpu/pvr/bridged_pvr_bridge.c @@ -1701,6 +1701,11 @@ PVRSRVConnectBW(IMG_UINT32 ui32BridgeID, #if defined(PDUMP) psPerProc->bPDumpPersistent |= ( (psConnectServicesIN->ui32Flags & SRV_FLAGS_PERSIST) != 0) ? IMG_TRUE : IMG_FALSE; + +#if defined(SUPPORT_PDUMP_MULTI_PROCESS) + + psPerProc->bPDumpActive |= ( (psConnectServicesIN->ui32Flags & SRV_FLAGS_PDUMP_ACTIVE) != 0) ? IMG_TRUE : IMG_FALSE; +#endif #else PVR_UNREFERENCED_PARAMETER(psConnectServicesIN); #endif @@ -3003,6 +3008,8 @@ static PVRSRV_ERROR DoQuerySyncOpsSatisfied(MODIFY_SYNC_OP_INFO *psModSyncOpInfo { #if defined(PDUMP) + + PDumpComment("Poll for read ops complete to reach value (%u)", psModSyncOpInfo->ui32ReadOpsPendingSnapShot); PDumpMemPolKM(psKernelSyncInfo->psSyncDataMemInfoKM, offsetof(PVRSRV_SYNC_DATA, ui32ReadOpsComplete), @@ -3408,20 +3415,28 @@ PVRSRVSyncOpsFlushToDeltaBW(IMG_UINT32 u } - PDumpComment("Poll for read ops complete to delta (%u)", psSyncOpsFlushToDeltaIN->ui32Delta); + PDumpComment("Poll for read ops complete to delta (%u)", + psSyncOpsFlushToDeltaIN->ui32Delta); psSyncOpsFlushToDeltaOUT->eError = PDumpMemPolKM(psSyncInfo->psSyncDataMemInfoKM, offsetof(PVRSRV_SYNC_DATA, ui32ReadOpsComplete), - ui32MinimumReadOpsComplete, + psSyncInfo->psSyncData->ui32LastReadOpDumpVal, 0xFFFFFFFF, PDUMP_POLL_OPERATOR_GREATEREQUAL, 0, MAKEUNIQUETAG(psSyncInfo->psSyncDataMemInfoKM)); - - - + PDumpComment("Poll for write ops complete to delta (%u)", + psSyncOpsFlushToDeltaIN->ui32Delta); + psSyncOpsFlushToDeltaOUT->eError = + PDumpMemPolKM(psSyncInfo->psSyncDataMemInfoKM, + offsetof(PVRSRV_SYNC_DATA, ui32WriteOpsComplete), + psSyncInfo->psSyncData->ui32LastOpDumpVal, + 0xFFFFFFFF, + PDUMP_POLL_OPERATOR_GREATEREQUAL, + 0, + MAKEUNIQUETAG(psSyncInfo->psSyncDataMemInfoKM)); #endif psSyncOpsFlushToDeltaOUT->eError = PVRSRV_OK; |