From 9e802736935816d5456ff93c990d3a751c11a971 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Sun, 25 Mar 2018 22:30:07 +0200 Subject: [PATCH] etnaviv: expose perfmon query groups Signed-off-by: Christian Gmeiner Tested-by: Chris Healy --- src/gallium/drivers/etnaviv/etnaviv_query.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_query.c b/src/gallium/drivers/etnaviv/etnaviv_query.c index 00f87d2..b076e87 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_query.c +++ b/src/gallium/drivers/etnaviv/etnaviv_query.c @@ -122,11 +122,15 @@ etna_get_driver_query_group_info(struct pipe_screen *pscreen, unsigned index, struct pipe_driver_query_group_info *info) { int nr_sw_groups = etna_sw_get_driver_query_group_info(pscreen, 0, NULL); + int nr_pm_groups = etna_pm_get_driver_query_group_info(pscreen, 0, NULL); if (!info) - return nr_sw_groups; + return nr_sw_groups + nr_pm_groups; - return etna_sw_get_driver_query_group_info(pscreen, index, info); + if (index < nr_sw_groups) + return etna_sw_get_driver_query_group_info(pscreen, index, info); + + return etna_pm_get_driver_query_group_info(pscreen, index, info); } static void -- 2.7.4