Mesa (master): nvc0: true up exposing of the HW_METRIC_QUERY_GROUP for maxwell

Ilia Mirkin imirkin at kemper.freedesktop.org
Mon Jan 16 21:05:34 UTC 2017


Module: Mesa
Branch: master
Commit: 0baa639f76b8e62327709298bc14637e28f27701
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0baa639f76b8e62327709298bc14637e28f27701

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sun Jan 15 13:19:04 2017 -0500

nvc0: true up exposing of the HW_METRIC_QUERY_GROUP for maxwell

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

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 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);




More information about the mesa-commit mailing list