diff options
Diffstat (limited to 'drivers/gpu/pvr/sgx/pb.c')
-rw-r--r-- | drivers/gpu/pvr/sgx/pb.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/gpu/pvr/sgx/pb.c b/drivers/gpu/pvr/sgx/pb.c index d9825c726a3..ab6523a9927 100644 --- a/drivers/gpu/pvr/sgx/pb.c +++ b/drivers/gpu/pvr/sgx/pb.c | |||
@@ -47,8 +47,8 @@ static IMPLEMENT_LIST_REMOVE(PVRSRV_STUB_PBDESC) | |||
47 | static PRESMAN_ITEM psResItemCreateSharedPB = IMG_NULL; | 47 | static PRESMAN_ITEM psResItemCreateSharedPB = IMG_NULL; |
48 | static PVRSRV_PER_PROCESS_DATA *psPerProcCreateSharedPB = IMG_NULL; | 48 | static PVRSRV_PER_PROCESS_DATA *psPerProcCreateSharedPB = IMG_NULL; |
49 | 49 | ||
50 | static PVRSRV_ERROR SGXCleanupSharedPBDescCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param); | 50 | static PVRSRV_ERROR SGXCleanupSharedPBDescCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param, IMG_BOOL bDummy); |
51 | static PVRSRV_ERROR SGXCleanupSharedPBDescCreateLockCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param); | 51 | static PVRSRV_ERROR SGXCleanupSharedPBDescCreateLockCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param, IMG_BOOL bDummy); |
52 | 52 | ||
53 | IMG_EXPORT PVRSRV_ERROR | 53 | IMG_EXPORT PVRSRV_ERROR |
54 | SGXFindSharedPBDescKM(PVRSRV_PER_PROCESS_DATA *psPerProc, | 54 | SGXFindSharedPBDescKM(PVRSRV_PER_PROCESS_DATA *psPerProc, |
@@ -217,22 +217,24 @@ SGXCleanupSharedPBDescKM(PVRSRV_STUB_PBDESC *psStubPBDescIn) | |||
217 | 217 | ||
218 | SGXCleanupRequest(psDeviceNode, | 218 | SGXCleanupRequest(psDeviceNode, |
219 | &sHWPBDescDevVAddr, | 219 | &sHWPBDescDevVAddr, |
220 | PVRSRV_CLEANUPCMD_PB); | 220 | PVRSRV_CLEANUPCMD_PB, |
221 | CLEANUP_WITH_POLL); | ||
221 | } | 222 | } |
222 | return PVRSRV_OK; | 223 | return PVRSRV_OK; |
223 | 224 | ||
224 | } | 225 | } |
225 | 226 | ||
226 | static PVRSRV_ERROR SGXCleanupSharedPBDescCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param) | 227 | static PVRSRV_ERROR SGXCleanupSharedPBDescCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param, IMG_BOOL bDummy) |
227 | { | 228 | { |
228 | PVRSRV_STUB_PBDESC *psStubPBDesc = (PVRSRV_STUB_PBDESC *)pvParam; | 229 | PVRSRV_STUB_PBDESC *psStubPBDesc = (PVRSRV_STUB_PBDESC *)pvParam; |
229 | 230 | ||
230 | PVR_UNREFERENCED_PARAMETER(ui32Param); | 231 | PVR_UNREFERENCED_PARAMETER(ui32Param); |
232 | PVR_UNREFERENCED_PARAMETER(bDummy); | ||
231 | 233 | ||
232 | return SGXCleanupSharedPBDescKM(psStubPBDesc); | 234 | return SGXCleanupSharedPBDescKM(psStubPBDesc); |
233 | } | 235 | } |
234 | 236 | ||
235 | static PVRSRV_ERROR SGXCleanupSharedPBDescCreateLockCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param) | 237 | static PVRSRV_ERROR SGXCleanupSharedPBDescCreateLockCallback(IMG_PVOID pvParam, IMG_UINT32 ui32Param, IMG_BOOL bDummy) |
236 | { | 238 | { |
237 | #ifdef DEBUG | 239 | #ifdef DEBUG |
238 | PVRSRV_PER_PROCESS_DATA *psPerProc = (PVRSRV_PER_PROCESS_DATA *)pvParam; | 240 | PVRSRV_PER_PROCESS_DATA *psPerProc = (PVRSRV_PER_PROCESS_DATA *)pvParam; |
@@ -242,6 +244,7 @@ static PVRSRV_ERROR SGXCleanupSharedPBDescCreateLockCallback(IMG_PVOID pvParam, | |||
242 | #endif | 244 | #endif |
243 | 245 | ||
244 | PVR_UNREFERENCED_PARAMETER(ui32Param); | 246 | PVR_UNREFERENCED_PARAMETER(ui32Param); |
247 | PVR_UNREFERENCED_PARAMETER(bDummy); | ||
245 | 248 | ||
246 | psPerProcCreateSharedPB = IMG_NULL; | 249 | psPerProcCreateSharedPB = IMG_NULL; |
247 | psResItemCreateSharedPB = IMG_NULL; | 250 | psResItemCreateSharedPB = IMG_NULL; |
@@ -255,7 +258,7 @@ SGXUnrefSharedPBDescKM(IMG_HANDLE hSharedPBDesc) | |||
255 | { | 258 | { |
256 | PVR_ASSERT(hSharedPBDesc != IMG_NULL); | 259 | PVR_ASSERT(hSharedPBDesc != IMG_NULL); |
257 | 260 | ||
258 | return ResManFreeResByPtr(hSharedPBDesc); | 261 | return ResManFreeResByPtr(hSharedPBDesc, CLEANUP_WITH_POLL); |
259 | } | 262 | } |
260 | 263 | ||
261 | 264 | ||
@@ -287,7 +290,7 @@ SGXAddSharedPBDescKM(PVRSRV_PER_PROCESS_DATA *psPerProc, | |||
287 | { | 290 | { |
288 | PVR_ASSERT(psResItemCreateSharedPB != IMG_NULL); | 291 | PVR_ASSERT(psResItemCreateSharedPB != IMG_NULL); |
289 | 292 | ||
290 | ResManFreeResByPtr(psResItemCreateSharedPB); | 293 | ResManFreeResByPtr(psResItemCreateSharedPB, CLEANUP_WITH_POLL); |
291 | 294 | ||
292 | PVR_ASSERT(psResItemCreateSharedPB == IMG_NULL); | 295 | PVR_ASSERT(psResItemCreateSharedPB == IMG_NULL); |
293 | PVR_ASSERT(psPerProcCreateSharedPB == IMG_NULL); | 296 | PVR_ASSERT(psPerProcCreateSharedPB == IMG_NULL); |