From 9845814c98af14bbd14e08db5cb467489f7fb32e Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Mon, 14 Aug 2023 15:28:05 -0400
Subject: [PATCH] asahi: Sync when beginning a query

Otherwise batch->writer might be non-null. Fixes Piglit occlusion_query_conform
(which I think regressed when we added proper syncing).

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24847>
---
 src/gallium/drivers/asahi/agx_query.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gallium/drivers/asahi/agx_query.c b/src/gallium/drivers/asahi/agx_query.c
index 435090956d0..9378b957780 100644
--- a/src/gallium/drivers/asahi/agx_query.c
+++ b/src/gallium/drivers/asahi/agx_query.c
@@ -81,6 +81,7 @@ agx_begin_query(struct pipe_context *pctx, struct pipe_query *pquery)
     */
    if (query->writer) {
       agx_flush_batch_for_reason(ctx, query->writer, "Query overwritten");
+      agx_sync_batch_for_reason(ctx, query->writer, "Query overwrriten");
    }
 
    assert(query->writer == NULL);