On 03/10/2016 01:28 AM, Ilia Mirkin wrote:
On Wed, Mar 9, 2016 at 6:23 PM, Samuel Pitoiset
<samuel.pitoi...@gmail.com> wrote:
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
  src/gallium/drivers/nouveau/nvc0/nvc0_query.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c 
b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
index 6836432..5cbc66e 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query.c
@@ -204,7 +204,8 @@ 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 <= NVE4_3D_CLASS) {
+         if (screen->base.class_3d <= NVF0_3D_CLASS &&
+             screen->base.class_3d != NVEA_3D_CLASS) {
              count += 2;
           }
        }
@@ -230,7 +231,8 @@ 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 <= NVE4_3D_CLASS) {
+          if (screen->base.class_3d <= NVF0_3D_CLASS &&
+              screen->base.class_3d != NVE4_3D_CLASS) {

4's do tend to look a lot like A's...

Really good catch. :-)
Thanks.


with the unnecessary attempt to filter out NVEA_3D_CLASS (which is
already filtered out because it's > NVF0_3D_CLASS), this whole series
is

Acked-by: Ilia Mirkin <imir...@alum.mit.edu>

              info->name = "Performance metrics";
              info->max_active_queries = 1;
              info->num_queries = nvc0_hw_metric_get_num_queries(screen);
--
2.7.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to