aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLionel Landwerlin <[email protected]>2020-03-05 10:54:46 +0200
committerLionel Landwerlin <[email protected]>2020-05-20 14:02:27 +0300
commit63c193e921e5936c0d4a906285627ac11fd267f7 (patch)
tree731566a6f9c61a8e0d42aecc8ef8ffa673af9c9e /src
parent93924ab0917b52be1a3001509b229c87b7ee6e54 (diff)
anv: use a query filled by the perf code
We're about to use the offset fields from the query object. We can't just use a made up object. Signed-off-by: Lionel Landwerlin <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2775>
Diffstat (limited to 'src')
-rw-r--r--src/intel/vulkan/genX_query.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/intel/vulkan/genX_query.c b/src/intel/vulkan/genX_query.c
index be7b860aded..17ccfc66dc9 100644
--- a/src/intel/vulkan/genX_query.c
+++ b/src/intel/vulkan/genX_query.c
@@ -376,11 +376,6 @@ VkResult genX(GetQueryPoolResults)(
const uint32_t *rpstat_begin = query_data + intel_perf_rpstart_offset(false);
const uint32_t *rpstat_end = query_data + intel_perf_mi_rpc_offset(true);
struct gen_perf_query_result result;
- struct gen_perf_query_info metric = {
- .oa_format = (GEN_GEN >= 8 ?
- I915_OA_FORMAT_A32u40_A4u32_B8_C8 :
- I915_OA_FORMAT_A45_B8_C8),
- };
uint32_t core_freq[2];
#if GEN_GEN < 9
core_freq[0] = ((*rpstat_begin >> 7) & 0x7f) * 1000000ULL;
@@ -390,7 +385,7 @@ VkResult genX(GetQueryPoolResults)(
core_freq[1] = ((*rpstat_end >> 23) & 0x1ff) * 1000000ULL;
#endif
gen_perf_query_result_clear(&result);
- gen_perf_query_result_accumulate(&result, &metric,
+ gen_perf_query_result_accumulate(&result, &device->physical->perf->queries[0],
oa_begin, oa_end);
gen_perf_query_result_read_frequencies(&result, &device->info,
oa_begin, oa_end);