summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Gmeiner <[email protected]>2018-03-25 22:30:07 +0200
committerChristian Gmeiner <[email protected]>2018-04-08 22:23:45 +0200
commit9e802736935816d5456ff93c990d3a751c11a971 (patch)
treec31b0b34d04444b06c37ecefe1bbad1c06f79f6a /src
parentc320b158f516276fed27b793e5d77b78015a2b9b (diff)
etnaviv: expose perfmon query groups
Signed-off-by: Christian Gmeiner <[email protected]> Tested-by: Chris Healy <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_query.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_query.c b/src/gallium/drivers/etnaviv/etnaviv_query.c
index 00f87d22cb1..b076e87e782 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