From 98d15e0550d16afdb41e115b86f5cac8439f1ca7 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Thu, 5 Apr 2018 22:31:25 +0100 Subject: [PATCH] nvc0: ensure the query's fence has been emitted in nvc0_hw_query_fifo_wait If the fence has not been emitted, hq->fence->sequence would be zero. This would result in the semaphore never being triggered, blocking all later commands in the pushbuf. Signed-off-by: Rhys Perry [imirkin: use nouveau_fence_emit instead] Reviewed-by: Ilia Mirkin --- src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c index 83a57fa0118..8ff3572c5cb 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c @@ -611,6 +611,10 @@ nvc0_hw_query_fifo_wait(struct nvc0_context *nvc0, struct nvc0_query *q) struct nvc0_hw_query *hq = nvc0_hw_query(q); unsigned offset = hq->offset; + /* ensure the query's fence has been emitted */ + if (hq->is64bit && hq->fence->state < NOUVEAU_FENCE_STATE_EMITTED) + nouveau_fence_emit(hq->fence); + if (q->type == PIPE_QUERY_SO_OVERFLOW_PREDICATE) offset += 0x20; PUSH_SPACE(push, 5); -- 2.30.2