From f5a8908bd1a995d48902b9b3066eae5f2d6a8817 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 27 Sep 2018 12:50:26 +0200
Subject: [PATCH] iris: fix random failures via CS stall...but why?

---
 src/gallium/drivers/iris/iris_query.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gallium/drivers/iris/iris_query.c b/src/gallium/drivers/iris/iris_query.c
index fac5e6b5e99..f746349361d 100644
--- a/src/gallium/drivers/iris/iris_query.c
+++ b/src/gallium/drivers/iris/iris_query.c
@@ -359,6 +359,12 @@ iris_get_query_result_resource(struct pipe_context *ctx,
          ice->vtbl.store_data_imm64(batch, iris_resource_bo(p_res), offset,
                                     q->result);
       }
+
+      /* Make sure the result lands before they use bind the QBO elsewhere
+       * and use the result.
+       */
+      // XXX: Why?  i965 doesn't do this.
+      iris_emit_pipe_control_flush(batch, PIPE_CONTROL_CS_STALL);
       return;
    }
 
-- 
2.30.2