From d1697fef1a92c9be74ff7447e1e16a9e8e4314f1 Mon Sep 17 00:00:00 2001
From: Christian Gmeiner <christian.gmeiner@gmail.com>
Date: Fri, 26 Jul 2019 12:32:40 +0200
Subject: [PATCH] etnaviv: reset no_wait_cnt after triggered flush

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1530>
---
 src/gallium/drivers/etnaviv/etnaviv_query_acc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_query_acc.c b/src/gallium/drivers/etnaviv/etnaviv_query_acc.c
index c025ee7144a..a1628534d27 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_query_acc.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_query_acc.c
@@ -177,8 +177,11 @@ etna_acc_get_query_result(struct etna_context *ctx, struct etna_query *q,
           * wait to flush unnecessarily but we also don't want to
           * spin forever.
           */
-         if (aq->no_wait_cnt++ > 5)
+         if (aq->no_wait_cnt++ > 5) {
             ctx->base.flush(&ctx->base, NULL, 0);
+            aq->no_wait_cnt = 0;
+         }
+
          return false;
       }
 
-- 
2.30.2