From e091f33990f9729bc4ccee7b3b04837f0d7b24b4 Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Wed, 29 May 2019 08:48:35 -0700 Subject: intel/perf: enumerate query-based metrics in perf Iris and i965 both need to enumerate the available metrics, so these routines must be located in perf. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_performance_query.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/i965/brw_performance_query.c') diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index 5dc47dcf560..6f7ab86d42b 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -1784,11 +1784,13 @@ brw_init_perf_query_info(struct gl_context *ctx) (capture_frequency_stat_register_t) capture_frequency_stat_register; init_pipeline_statistic_query_registers(brw); - brw_perf_query_register_mdapi_statistic_query(brw); + gen_perf_query_register_mdapi_statistic_query(&brw->screen->devinfo, + brw->perfquery.perf); if ((oa_metrics_kernel_support(screen->fd, devinfo)) && (gen_perf_load_oa_metrics(perf_cfg, screen->fd, devinfo))) - brw_perf_query_register_mdapi_oa_query(brw); + gen_perf_query_register_mdapi_oa_query(&brw->screen->devinfo, + brw->perfquery.perf); brw->perfquery.unaccumulated = ralloc_array(brw, struct brw_perf_query_object *, 2); -- cgit v1.2.3