From: Marek Olšák <marek.olsak@amd.com>
Date: Sat, 7 Nov 2015 18:31:55 +0000 (+0100)
Subject: gallium/radeon: fix PIPE_QUERY_GPU_FINISHED
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=01526136badbc611b7dafa5a99934e7e8cf527e8;p=mesa.git

gallium/radeon: fix PIPE_QUERY_GPU_FINISHED

Broken by the addition of r600_multi_fence
in 3b37155a68acc351cba86a1fa142bd0de2192d4c

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89014

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index 9a5402583f4..2bb5732262f 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -532,7 +532,7 @@ static void r600_end_query(struct pipe_context *ctx, struct pipe_query *query)
 	case PIPE_QUERY_TIMESTAMP_DISJOINT:
 		return;
 	case PIPE_QUERY_GPU_FINISHED:
-		rctx->rings.gfx.flush(rctx, RADEON_FLUSH_ASYNC, &rquery->fence);
+		ctx->flush(ctx, &rquery->fence, 0);
 		return;
 	case R600_QUERY_DRAW_CALLS:
 		rquery->end_result = rctx->num_draw_calls;