From 168dc73fa9dbe9a1ff7fc4ec3095d3801eb30212 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Thu, 1 Aug 2024 00:04:45 +0200
Subject: [PATCH] nouveau: use nv_device_info directly for dumping push buffers

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30455>
---
 src/gallium/winsys/nouveau/drm/nouveau.c | 18 ++++++------------
 src/gallium/winsys/nouveau/drm/nouveau.h |  8 +-------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/gallium/winsys/nouveau/drm/nouveau.c b/src/gallium/winsys/nouveau/drm/nouveau.c
index d487e89fdbc..27cbdc10033 100644
--- a/src/gallium/winsys/nouveau/drm/nouveau.c
+++ b/src/gallium/winsys/nouveau/drm/nouveau.c
@@ -484,10 +484,10 @@ nouveau_device_set_classes_for_debug(struct nouveau_device *dev,
                                      uint32_t cls_m2mf,
                                      uint32_t cls_copy)
 {
-   dev->cls_eng3d = cls_eng3d;
-   dev->cls_compute = cls_compute;
-   dev->cls_m2mf = cls_m2mf;
-   dev->cls_copy = cls_copy;
+   dev->info.cls_eng3d = cls_eng3d;
+   dev->info.cls_compute = cls_compute;
+   dev->info.cls_m2mf = cls_m2mf;
+   dev->info.cls_copy = cls_copy;
 }
 
 void
@@ -1130,18 +1130,12 @@ pushbuf_dump(struct nouveau_device *dev,
       if (!bo->map)
          continue;
 
-      if (dev->cls_eng3d) {
-         struct nv_device_info info = {
-            .cls_eng3d = dev->cls_eng3d,
-            .cls_compute = dev->cls_compute,
-            .cls_m2mf = dev->cls_m2mf,
-            .cls_copy = dev->cls_copy,
-         };
+      if (dev->info.cls_eng3d) {
          struct nv_push push = {
             .start = bgn,
             .end = end
          };
-         vk_push_print(nouveau_out, &push, &info);
+         vk_push_print(nouveau_out, &push, &dev->info);
       } else {
          while (bgn < end)
             err("\t0x%08x\n", *bgn++);
diff --git a/src/gallium/winsys/nouveau/drm/nouveau.h b/src/gallium/winsys/nouveau/drm/nouveau.h
index 29f68bee397..67b0c8b874e 100644
--- a/src/gallium/winsys/nouveau/drm/nouveau.h
+++ b/src/gallium/winsys/nouveau/drm/nouveau.h
@@ -52,14 +52,8 @@ struct nouveau_device {
    uint64_t vram_limit;
    uint64_t gart_limit;
 
-   /* only pci info and device type are set */
+   /* only pci info, class ids and and device type are set */
    struct nv_device_info info;
-
-   /* classes for common push buf dumping */
-   uint32_t cls_eng3d;
-   uint32_t cls_compute;
-   uint32_t cls_m2mf;
-   uint32_t cls_copy;
 };
 
 struct nouveau_client {