Mesa (main): intel/perf: stop overriding oa_format

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 376e420abbcb9455c9ad69d8a94a92c0bee8e930
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=376e420abbcb9455c9ad69d8a94a92c0bee8e930

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Wed Jul  7 00:12:13 2021 -0700

intel/perf: stop overriding oa_format

This already set in the intel_perf_setup.h file at metric set
creation.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16144>

---

 src/intel/perf/intel_perf.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/intel/perf/intel_perf.c b/src/intel/perf/intel_perf.c
index a377a241fc6..a33520f2076 100644
--- a/src/intel/perf/intel_perf.c
+++ b/src/intel/perf/intel_perf.c
@@ -180,8 +180,6 @@ register_oa_config(struct intel_perf_config *perf,
       intel_perf_append_query_info(perf, 0);
 
    *registered_query = *query;
-   registered_query->oa_format = devinfo->ver >= 8 ?
-      I915_OA_FORMAT_A32u40_A4u32_B8_C8 : I915_OA_FORMAT_A45_B8_C8;
    registered_query->oa_metrics_set_id = config_id;
    DBG("metric set registered: id = %" PRIu64", guid = %s\n",
        registered_query->oa_metrics_set_id, query->guid);