geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: Avoid pthread mutex recursion in bufmgr_fake. 

Bug #18035. Fixes deadlock in glean texCube testcase.
main
Eric Anholt 2008-10-13 13:41:10 -07:00
parent c6109df93b
commit 3e03d781f7
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libdrm/intel/intel_bufmgr_fake.c
View File

@ -716,6 +716,18 @@ dri_bufmgr_fake_wait_idle(dri_bufmgr_fake *bufmgr_fake)
* It is assumed that the bathcbuffer which performed the rendering included
* the necessary flushing.
*/
static void
dri_fake_bo_wait_rendering_locked(dri_bo *bo)
{
dri_bufmgr_fake *bufmgr_fake = (dri_bufmgr_fake *)bo->bufmgr;
dri_bo_fake *bo_fake = (dri_bo_fake *)bo;
if (bo_fake->block == NULL || !bo_fake->block->fenced)
return;
_fence_wait_internal(bufmgr_fake, bo_fake->block->fence);
}
static void
dri_fake_bo_wait_rendering(dri_bo *bo)
{
@ -723,14 +735,7 @@ dri_fake_bo_wait_rendering(dri_bo *bo)
dri_bo_fake *bo_fake = (dri_bo_fake *)bo;
pthread_mutex_lock(&bufmgr_fake->lock);
if (bo_fake->block == NULL || !bo_fake->block->fenced) {
pthread_mutex_unlock(&bufmgr_fake->lock);
return;
}
_fence_wait_internal(bufmgr_fake, bo_fake->block->fence);
dri_fake_bo_wait_rendering_locked(bo);
pthread_mutex_unlock(&bufmgr_fake->lock);
}
@ -972,7 +977,7 @@ dri_fake_bo_map_locked(dri_bo *bo, int write_enable)
if (!(bo_fake->flags & BM_NO_FENCE_SUBDATA) &&
bo_fake->block->fenced) {
dri_fake_bo_wait_rendering(bo);
dri_fake_bo_wait_rendering_locked(bo);
}
bo->virtual = bo_fake->block->virtual;
@ -987,7 +992,7 @@ dri_fake_bo_map_locked(dri_bo *bo, int write_enable)
if ((bo_fake->card_dirty == 1) && bo_fake->block) {
if (bo_fake->block->fenced)
dri_fake_bo_wait_rendering(bo);
dri_fake_bo_wait_rendering_locked(bo);
memcpy(bo_fake->backing_store, bo_fake->block->virtual, bo_fake->block->bo->size);
bo_fake->card_dirty = 0;