diff options
Diffstat (limited to 'src/intel/perf/gen_perf.h')
| -rw-r--r-- | src/intel/perf/gen_perf.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/intel/perf/gen_perf.h b/src/intel/perf/gen_perf.h index ca4a66a2e9d..95aeab9182f 100644 --- a/src/intel/perf/gen_perf.h +++ b/src/intel/perf/gen_perf.h @@ -171,16 +171,6 @@ struct gen_perf_query_counter { enum gen_perf_counter_units units; uint64_t raw_max; size_t offset; - uint64_t query_mask; - - /** - * Each counter can be a part of many groups, each time at different index. - * This struct stores one of those locations. - */ - struct { - int group_idx; /* query/group number */ - int counter_idx; /* index inside of query/group */ - } location; union { uint64_t (*oa_counter_read_uint64)(struct gen_perf_config *perf, @@ -237,6 +227,21 @@ struct gen_perf_query_info { struct gen_perf_registers config; }; +struct gen_perf_query_counter_info { + struct gen_perf_query_counter *counter; + + uint64_t query_mask; + + /** + * Each counter can be a part of many groups, each time at different index. + * This struct stores one of those locations. + */ + struct { + int group_idx; /* query/group number */ + int counter_idx; /* index inside of query/group */ + } location; +}; + struct gen_perf_config { /* Whether i915 has DRM_I915_QUERY_PERF_CONFIG support. */ bool i915_query_supported; @@ -250,7 +255,7 @@ struct gen_perf_config { struct gen_perf_query_info *queries; int n_queries; - struct gen_perf_query_counter **counters; + struct gen_perf_query_counter_info *counter_infos; int n_counters; /* Variables referenced in the XML meta data for OA performance |