Mesa (main): intel/dev: Add vram.unmappable.size region info

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d2829ffe4e4eb211e94b085d40739a4064e148de
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2829ffe4e4eb211e94b085d40739a4064e148de

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Fri Jun 10 18:10:27 2022 -0700

intel/dev: Add vram.unmappable.size region info

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17349>

---

 src/intel/dev/intel_device_info.c | 3 ++-
 src/intel/dev/intel_device_info.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index f91dd765c00..28263c1e6df 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -1629,7 +1629,8 @@ query_regions(struct intel_device_info *devinfo, int fd, bool update)
          } else {
             assert(devinfo->mem.vram.mem_class == mem->region.memory_class);
             assert(devinfo->mem.vram.mem_instance == mem->region.memory_instance);
-            assert(devinfo->mem.vram.mappable.size == mem->probed_size);
+            assert((devinfo->mem.vram.mappable.size +
+                    devinfo->mem.vram.unmappable.size) == mem->probed_size);
          }
          if (mem->unallocated_size != -1)
             devinfo->mem.vram.mappable.free = mem->unallocated_size;
diff --git a/src/intel/dev/intel_device_info.h b/src/intel/dev/intel_device_info.h
index abfddd08c32..e1d371da82e 100644
--- a/src/intel/dev/intel_device_info.h
+++ b/src/intel/dev/intel_device_info.h
@@ -400,7 +400,7 @@ struct intel_device_info
          struct {
             uint64_t size;
             uint64_t free;
-         } mappable;
+         } mappable, unmappable;
       } sram, vram;
    } mem;
    /** @} */