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

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

diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index f91dd76..28263c1 100644 (file)
--- 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 abfddd0..e1d371d 100644 (file)
--- 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;
    /** @} */