diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-06-06 20:30:48 -0400 |
|---|---|---|
| committer | Mauro Rossi <issor.oruam@gmail.com> | 2016-11-01 20:41:59 +0100 |
| commit | 337e2d96073453ece1a6bff86f84ad158b0799c1 (patch) | |
| tree | 1d4f64429c0bc283f6f07ab7280a9e0c7c9803e4 /src/gallium/drivers/nouveau/nv50 | |
| parent | 4ff74f05af48bf8b49d3c5daaae0ff1c1dc918c9 (diff) | |
| download | external_mesa3d-337e2d96073453ece1a6bff86f84ad158b0799c1.zip external_mesa3d-337e2d96073453ece1a6bff86f84ad158b0799c1.tar.gz external_mesa3d-337e2d96073453ece1a6bff86f84ad158b0799c1.tar.bz2 | |
nouveau: more locking - make sure that fence work is always done with
the push mutex acquired
Diffstat (limited to 'src/gallium/drivers/nouveau/nv50')
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_miptree.c | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_query_hw.c | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_miptree.c b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c index f2e304f..7f281f9 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_miptree.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c @@ -163,10 +163,13 @@ nv50_miptree_destroy(struct pipe_screen *pscreen, struct pipe_resource *pt) { struct nv50_miptree *mt = nv50_miptree(pt); - if (mt->base.fence && mt->base.fence->state < NOUVEAU_FENCE_STATE_FLUSHED) + if (mt->base.fence && mt->base.fence->state < NOUVEAU_FENCE_STATE_FLUSHED) { + pipe_mutex_lock(nouveau_screen(pscreen)->push_mutex); nouveau_fence_work(mt->base.fence, nouveau_fence_unref_bo, mt->base.bo); - else + pipe_mutex_unlock(nouveau_screen(pscreen)->push_mutex); + } else { nouveau_bo_ref(NULL, &mt->base.bo); + } nouveau_fence_ref(NULL, &mt->base.fence); nouveau_fence_ref(NULL, &mt->base.fence_wr); diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c index 9067bcc..d2ad72e 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c @@ -56,9 +56,12 @@ nv50_hw_query_allocate(struct nv50_context *nv50, struct nv50_query *q, if (hq->mm) { if (hq->state == NV50_HW_QUERY_STATE_READY) nouveau_mm_free(hq->mm); - else + else { + pipe_mutex_lock(screen->base.push_mutex); nouveau_fence_work(screen->base.fence.current, nouveau_mm_free_work, hq->mm); + pipe_mutex_unlock(screen->base.push_mutex); + } } } if (size) { |