[Mesa-dev] [PATCH] nvc0: true up exposing of the HW_METRIC_QUERY_GROUP for maxwell

Ilia Mirkin imirkin at alum.mit.edu
Sun Jan 15 18:21:34 UTC 2017


This had been updated in one place but not the other.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---

Not sure about that first one - should it do count++ irrespectively, and then count++ again for <= GM200? Or can all that checking stuff just go away?

 src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
index 8b9e6b6..68e0a63 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
@@ -205,7 +205,7 @@ nvc0_screen_get_driver_query_group_info(struct pipe_screen *pscreen,
 
    if (screen->base.drm->version >= 0x01000101) {
       if (screen->compute) {
-         if (screen->base.class_3d <= NVF0_3D_CLASS) {
+         if (screen->base.class_3d <= GM200_3D_CLASS) {
             count += 2;
          }
       }
@@ -229,7 +229,7 @@ nvc0_screen_get_driver_query_group_info(struct pipe_screen *pscreen,
    } else
    if (id == NVC0_HW_METRIC_QUERY_GROUP) {
       if (screen->compute) {
-          if (screen->base.class_3d <= NVF0_3D_CLASS) {
+          if (screen->base.class_3d <= GM200_3D_CLASS) {
             info->name = "Performance metrics";
             info->max_active_queries = 4; /* A metric uses at least 2 queries */
             info->num_queries = nvc0_hw_metric_get_num_queries(screen);
-- 
2.10.2



More information about the mesa-dev mailing list