diff options
| author | Alistair Strachan <alistair.strachan@imgtec.com> | 2012-05-01 17:45:05 +0100 |
|---|---|---|
| committer | Alistair Strachan <alistair.strachan@imgtec.com> | 2012-05-01 17:45:05 +0100 |
| commit | 97de76ff2feb7b27da1365e92a9386d5621322a5 (patch) | |
| tree | 309b90e605ea71be20b411ef41f55d246ae89b81 /drivers/gpu/pvr/devicemem.c | |
| parent | 10add970b62d2276541af9e5fb0581d6d8434db4 (diff) | |
| download | kernel_samsung_crespo-97de76ff2feb7b27da1365e92a9386d5621322a5.zip kernel_samsung_crespo-97de76ff2feb7b27da1365e92a9386d5621322a5.tar.gz kernel_samsung_crespo-97de76ff2feb7b27da1365e92a9386d5621322a5.tar.bz2 | |
gpu: pvr: Update to DDK 1.8@900138.
- Fixed "XPROC workaround in a bad state" messages, issue
http://b/5806132.
- Fixed missing GPL header in sgx_ukernel_status_codes.h.
Change-Id: Id7c73b4367f4534b44e2170c4610803050c7b396
Diffstat (limited to 'drivers/gpu/pvr/devicemem.c')
| -rw-r--r-- | drivers/gpu/pvr/devicemem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/pvr/devicemem.c b/drivers/gpu/pvr/devicemem.c index b5968c6..8874d61 100644 --- a/drivers/gpu/pvr/devicemem.c +++ b/drivers/gpu/pvr/devicemem.c @@ -566,6 +566,7 @@ PVRSRV_ERROR IMG_CALLCONV PVRSRVAllocSyncInfoKM(IMG_HANDLE hDevCookie, psSyncData->ui32ReadOps2Complete = 0; psSyncData->ui32LastOpDumpVal = 0; psSyncData->ui32LastReadOpDumpVal = 0; + psSyncData->ui64LastWrite = 0; #if defined(PDUMP) PDUMPCOMMENT("Allocating kernel sync object"); @@ -669,7 +670,7 @@ PVRSRV_ERROR _PollUntilAtLeast(volatile IMG_UINT32* pui32WatchedValue, if(psSysData->psGlobalEventObject) { eError = OSEventObjectOpenKM(psSysData->psGlobalEventObject, &hOSEventKM); - if (eError |= PVRSRV_OK) + if (eError != PVRSRV_OK) { PVR_DPF((PVR_DBG_ERROR, "_PollUntilAtLeast: OSEventObjectOpen failed")); |