gallium/radeon: fix crash/regression in performance counters
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Fri, 30 Sep 2016 10:00:44 +0000 (12:00 +0200)
committerNicolai Hähnle <nicolai.haehnle@amd.com>
Fri, 30 Sep 2016 10:41:45 +0000 (12:41 +0200)
Regression introduced by "gallium/radeon: zero all query buffers".

Cc: Michel Dänzer <michel@daenzer.net>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/drivers/radeon/r600_perfcounter.c

index f8dfda089279903a62dee6520cea0b63290220c6..0c55fc2a2cfe439b9a567a7a1950f9cdb88211a7 100644 (file)
@@ -115,6 +115,14 @@ static void r600_pc_query_destroy(struct r600_common_context *ctx,
        r600_query_hw_destroy(ctx, rquery);
 }
 
+static bool r600_pc_query_prepare_buffer(struct r600_common_context *ctx,
+                                        struct r600_query_hw *hwquery,
+                                        struct r600_resource *buffer)
+{
+       /* no-op */
+       return true;
+}
+
 static void r600_pc_query_emit_start(struct r600_common_context *ctx,
                                     struct r600_query_hw *hwquery,
                                     struct r600_resource *buffer, uint64_t va)
@@ -215,6 +223,7 @@ static struct r600_query_ops batch_query_ops = {
 };
 
 static struct r600_query_hw_ops batch_query_hw_ops = {
+       .prepare_buffer = r600_pc_query_prepare_buffer,
        .emit_start = r600_pc_query_emit_start,
        .emit_stop = r600_pc_query_emit_stop,
        .clear_result = r600_pc_query_clear_result,