panfrost: Remove deadcode

[mesa.git] / src / gallium / drivers / etnaviv / etnaviv_query.c

diff --git a/src/gallium/drivers/etnaviv/etnaviv_query.c b/src/gallium/drivers/etnaviv/etnaviv_query.c
index 16adb8c21fcfdd04f5c668bf46e36026c33a984b..01ec3bebc8e5d1ac59058126eb1acb00c1e8b7d6 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_query.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_query.c
@@ -26,9 +26,12 @@
  */
 
 #include "pipe/p_screen.h"
+#include "util/u_inlines.h"
 
 #include "etnaviv_context.h"
+#include "etnaviv_perfmon.h"
 #include "etnaviv_query.h"
+#include "etnaviv_query_acc.h"
 #include "etnaviv_query_sw.h"
 
 static struct pipe_query *
@@ -39,6 +42,8 @@ etna_create_query(struct pipe_context *pctx, unsigned query_type,
    struct etna_query *q;
 
    q = etna_sw_create_query(ctx, query_type);
+   if (!q)
+      q = etna_acc_create_query(ctx, query_type);
 
    return (struct pipe_query *)q;
 }
@@ -51,12 +56,14 @@ etna_destroy_query(struct pipe_context *pctx, struct pipe_query *pq)
    q->funcs->destroy_query(etna_context(pctx), q);
 }
 
-static boolean
+static bool
 etna_begin_query(struct pipe_context *pctx, struct pipe_query *pq)
 {
    struct etna_query *q = etna_query(pq);
 
-   return q->funcs->begin_query(etna_context(pctx), q);
+   q->funcs->begin_query(etna_context(pctx), q);
+
+   return true;
 }
 
 static bool
@@ -65,15 +72,18 @@ etna_end_query(struct pipe_context *pctx, struct pipe_query *pq)
    struct etna_query *q = etna_query(pq);
 
    q->funcs->end_query(etna_context(pctx), q);
+
    return true;
 }
 
-static boolean
+static bool
 etna_get_query_result(struct pipe_context *pctx, struct pipe_query *pq,
-                      boolean wait, union pipe_query_result *result)
+                      bool wait, union pipe_query_result *result)
 {
    struct etna_query *q = etna_query(pq);
 
+   util_query_clear_result(result, q->type);
+
    return q->funcs->get_query_result(etna_context(pctx), q, wait, result);
 }
 
@@ -82,22 +92,52 @@ etna_get_driver_query_info(struct pipe_screen *pscreen, unsigned index,
                            struct pipe_driver_query_info *info)
 {
    int nr_sw_queries = etna_sw_get_driver_query_info(pscreen, 0, NULL);
+   int nr_pm_queries = etna_pm_get_driver_query_info(pscreen, 0, NULL);
 
    if (!info)
-      return nr_sw_queries;
+      return nr_sw_queries + nr_pm_queries;
+
+   if (index < nr_sw_queries)
+      return etna_sw_get_driver_query_info(pscreen, index, info);
 
-   return etna_sw_get_driver_query_info(pscreen, index, info);
+   return etna_pm_get_driver_query_info(pscreen, index - nr_sw_queries, info);
+}
+
+static int
+etna_get_driver_query_group_info(struct pipe_screen *pscreen, unsigned index,
+                                 struct pipe_driver_query_group_info *info)
+{
+   int nr_sw_groups = etna_sw_get_driver_query_group_info(pscreen, 0, NULL);
+   int nr_pm_groups = etna_pm_get_driver_query_group_info(pscreen, 0, NULL);
+
+   if (!info)
+      return nr_sw_groups + nr_pm_groups;
+
+   if (index < nr_sw_groups)
+      return etna_sw_get_driver_query_group_info(pscreen, index, info);
+
+   return etna_pm_get_driver_query_group_info(pscreen, index, info);
 }
 
 static void
-etna_set_active_query_state(struct pipe_context *pipe, boolean enable)
+etna_set_active_query_state(struct pipe_context *pctx, bool enable)
 {
+   struct etna_context *ctx = etna_context(pctx);
+
+   if (enable) {
+      list_for_each_entry(struct etna_acc_query, aq, &ctx->active_acc_queries, node)
+         etna_acc_query_resume(aq, ctx);
+   } else {
+      list_for_each_entry(struct etna_acc_query, aq, &ctx->active_acc_queries, node)
+         etna_acc_query_suspend(aq, ctx);
+   }
 }
 
 void
 etna_query_screen_init(struct pipe_screen *pscreen)
 {
    pscreen->get_driver_query_info = etna_get_driver_query_info;
+   pscreen->get_driver_query_group_info = etna_get_driver_query_group_info;
 }
 
 void