Mesa (master): anv: Don' t crash on invalid heap sizes when the PCI ID is overriden

[Jason Ekstrand]

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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Nov  8 14:24:57 2017 -0800

anv: Don't crash on invalid heap sizes when the PCI ID is overriden

---

 src/intel/vulkan/anv_device.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 67028e8da9..3aa213e205 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -113,6 +113,18 @@ anv_physical_device_init_heaps(struct anv_physical_device *device, int fd)
    if (result != VK_SUCCESS)
       return result;
 
+   if (heap_size > (2ull << 30) && !device->supports_48bit_addresses) {
+      /* When running with an overridden PCI ID, we may get a GTT size from
+       * the kernel that is greater than 2 GiB but the execbuf check for 48bit
+       * address support can still fail.  Just clamp the address space size to
+       * 2 GiB if we don't have 48-bit support.
+       */
+      intel_logw("%s:%d: The kernel reported a GTT size larger than 2 GiB but "
+                        "not support for 48-bit addresses",
+                        __FILE__, __LINE__);
+      heap_size = 2ull << 30;
+   }
+
    if (heap_size <= 3ull * (1ull << 30)) {
       /* In this case, everything fits nicely into the 32-bit address space,
        * so there's no need for supporting 48bit addresses on client-allocated