From be518657b9c3df0f8a71cb43d65ccdf0475af8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Wed, 20 Mar 2024 12:04:16 -0700 Subject: [PATCH] intel/perf: Change oa_format to uint64_t MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xe KMD will not provide a enum with formats, instead UMD needs set a uint64_t with type, counter_sel, counter_size and bc_report for the format. So here changing from int to uint64_t, it do not causes any issues for i915 and makes it ready for Xe KMD. Reviewed-by: Lionel Landwerlin Signed-off-by: José Roberto de Souza Part-of: --- src/intel/perf/intel_perf.h | 2 +- src/intel/perf/intel_perf_query.c | 2 +- src/intel/perf/intel_perf_query.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intel/perf/intel_perf.h b/src/intel/perf/intel_perf.h index 9a4d1b587ad..011fbf98693 100644 --- a/src/intel/perf/intel_perf.h +++ b/src/intel/perf/intel_perf.h @@ -248,7 +248,7 @@ struct intel_perf_query_info { /* OA specific */ uint64_t oa_metrics_set_id; - int oa_format; + uint64_t oa_format; /* For indexing into the accumulator[] ... */ int gpu_time_offset; diff --git a/src/intel/perf/intel_perf_query.c b/src/intel/perf/intel_perf_query.c index 0336f341c71..cf2055c68cb 100644 --- a/src/intel/perf/intel_perf_query.c +++ b/src/intel/perf/intel_perf_query.c @@ -351,7 +351,7 @@ intel_perf_close(struct intel_perf_context *perfquery, bool intel_perf_open(struct intel_perf_context *perf_ctx, int metrics_set_id, - int report_format, + uint64_t report_format, int period_exponent, int drm_fd, uint32_t ctx_id, diff --git a/src/intel/perf/intel_perf_query.h b/src/intel/perf/intel_perf_query.h index 5b7f2fc8645..4b1e3e201e6 100644 --- a/src/intel/perf/intel_perf_query.h +++ b/src/intel/perf/intel_perf_query.h @@ -39,7 +39,7 @@ struct intel_perf_query_object; bool intel_perf_open(struct intel_perf_context *perf_ctx, int metrics_set_id, - int report_format, + uint64_t report_format, int period_exponent, int drm_fd, uint32_t ctx_id,