From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 19 Jun 2019 04:47:12 +0000 (-0500)
Subject: iris: Bail on queries for INTEL_NO_HW=1.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbbf7a538c3d7a6b11569d8ff20c3e51f7c3eff0;p=mesa.git

iris: Bail on queries for INTEL_NO_HW=1.

We don't execute any of the commands to record snapshots, so we can't
actually produce a real result.  We do however need to avoid waiting
on a syncpt which will never be signalled.  So, just return 0.
---

diff --git a/src/gallium/drivers/iris/iris_query.c b/src/gallium/drivers/iris/iris_query.c
index 6d9659080a7..d30011fe467 100644
--- a/src/gallium/drivers/iris/iris_query.c
+++ b/src/gallium/drivers/iris/iris_query.c
@@ -859,6 +859,11 @@ iris_get_query_result(struct pipe_context *ctx,
    const struct gen_device_info *devinfo = &screen->devinfo;
    struct iris_bo *bo = iris_resource_bo(q->query_state_ref.res);
 
+   if (unlikely(screen->no_hw)) {
+      result->u64 = 0;
+      return true;
+   }
+
    if (!q->ready) {
       if (iris_batch_references(&ice->batches[q->batch_idx], bo))
          iris_batch_flush(&ice->batches[q->batch_idx]);