etnaviv: add basic infrastructure for hw queries

No hardware query is supported yet.

v1 -> v2
 - removed query_type from strcut etna_hw_sample_provider

Signed-off-by: Christian Gmeiner <[email protected]>
Reviewed-by: Wladimir J. van der Laan <[email protected]>

1 files changed, 185 insertions, 0 deletions

diff --git a/src/gallium/drivers/etnaviv/etnaviv_query_hw.c b/src/gallium/drivers/etnaviv/etnaviv_query_hw.c
new file mode 100644
index 00000000000..a1dead335c4
--- /dev/null
+++ b/src/gallium/drivers/etnaviv/etnaviv_query_hw.c
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2017 Etnaviv Project
+ * Copyright (C) 2017 Zodiac Inflight Innovations
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Rob Clark <[email protected]>
+ *    Christian Gmeiner <[email protected]>
+ */
+
+#include "util/u_inlines.h"
+#include "util/u_memory.h"
+
+#include "etnaviv_context.h"
+#include "etnaviv_query_hw.h"
+#include "etnaviv_screen.h"
+
+static void
+etna_hw_destroy_query(struct etna_context *ctx, struct etna_query *q)
+{
+   struct etna_hw_query *hq = etna_hw_query(q);
+
+   pipe_resource_reference(&hq->prsc, NULL);
+   list_del(&hq->node);
+
+   FREE(hq);
+}
+
+static void
+realloc_query_bo(struct etna_context *ctx, struct etna_hw_query *hq)
+{
+   struct etna_resource *rsc;
+   void *map;
+
+   pipe_resource_reference(&hq->prsc, NULL);
+
+   /* allocate resource with space for 64 * 64bit values */
+   hq->prsc = pipe_buffer_create(&ctx->screen->base, PIPE_BIND_QUERY_BUFFER,
+                                 0, 0x1000);
+
+   /* don't assume the buffer is zero-initialized */
+   rsc = etna_resource(hq->prsc);
+
+   etna_bo_cpu_prep(rsc->bo, DRM_ETNA_PREP_WRITE);
+
+   map = etna_bo_map(rsc->bo);
+   memset(map, 0, 0x1000);
+   etna_bo_cpu_fini(rsc->bo);
+}
+
+static boolean
+etna_hw_begin_query(struct etna_context *ctx, struct etna_query *q)
+{
+   struct etna_hw_query *hq = etna_hw_query(q);
+   const struct etna_hw_sample_provider *p = hq->provider;
+
+   /* ->begin_query() discards previous results, so realloc bo */
+   realloc_query_bo(ctx, hq);
+
+   p->start(hq, ctx);
+
+   /* add to active list */
+   assert(list_empty(&hq->node));
+   list_addtail(&hq->node, &ctx->active_hw_queries);
+
+   return true;
+}
+
+static void
+etna_hw_end_query(struct etna_context *ctx, struct etna_query *q)
+{
+   struct etna_hw_query *hq = etna_hw_query(q);
+   const struct etna_hw_sample_provider *p = hq->provider;
+
+   p->stop(hq, ctx);
+
+   /* remove from active list */
+   list_delinit(&hq->node);
+}
+
+static boolean
+etna_hw_get_query_result(struct etna_context *ctx, struct etna_query *q,
+                         boolean wait, union pipe_query_result *result)
+{
+   struct etna_hw_query *hq = etna_hw_query(q);
+   struct etna_resource *rsc = etna_resource(hq->prsc);
+   const struct etna_hw_sample_provider *p = hq->provider;
+
+   assert(LIST_IS_EMPTY(&hq->node));
+
+   if (!wait) {
+      int ret;
+
+      if (rsc->status & ETNA_PENDING_WRITE) {
+         /* piglit spec@arb_occlusion_query@occlusion_query_conform
+          * test, and silly apps perhaps, get stuck in a loop trying
+          * to get query result forever with wait==false..  we don't
+          * wait to flush unnecessarily but we also don't want to
+          * spin forever.
+          */
+         if (hq->no_wait_cnt++ > 5)
+            ctx->base.flush(&ctx->base, NULL, 0);
+         return false;
+      }
+
+      ret = etna_bo_cpu_prep(rsc->bo, DRM_ETNA_PREP_READ | DRM_ETNA_PREP_NOSYNC);
+      if (ret)
+         return false;
+
+      etna_bo_cpu_fini(rsc->bo);
+   }
+
+   /* flush that GPU executes all query related actions */
+   ctx->base.flush(&ctx->base, NULL, 0);
+
+   /* get the result */
+   etna_bo_cpu_prep(rsc->bo, DRM_ETNA_PREP_READ);
+
+   void *ptr = etna_bo_map(rsc->bo);
+   p->result(hq, ptr, result);
+
+   etna_bo_cpu_fini(rsc->bo);
+
+   return true;
+}
+
+static const struct etna_query_funcs hw_query_funcs = {
+   .destroy_query = etna_hw_destroy_query,
+   .begin_query = etna_hw_begin_query,
+   .end_query = etna_hw_end_query,
+   .get_query_result = etna_hw_get_query_result,
+};
+
+static inline const struct etna_hw_sample_provider *
+query_sample_provider(unsigned query_type)
+{
+   switch (query_type) {
+   default:
+      return NULL;
+   }
+}
+
+struct etna_query *
+etna_hw_create_query(struct etna_context *ctx, unsigned query_type)
+{
+   struct etna_hw_query *hq;
+   struct etna_query *q;
+   const struct etna_hw_sample_provider *p;
+
+   p = query_sample_provider(query_type);
+   if (!p)
+      return NULL;
+
+   hq = CALLOC_STRUCT(etna_hw_query);
+   if (!hq)
+      return NULL;
+
+   hq->provider = p;
+
+   list_inithead(&hq->node);
+
+   q = &hq->base;
+   q->funcs = &hw_query_funcs;
+   q->type = query_type;
+
+   return q;
+}