Mesa (master): anv: Predicate 48bit support on gen >= 8

[Jason Ekstrand]

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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu May 18 10:57:42 2017 -0700

anv: Predicate 48bit support on gen >= 8

This doesn't matter right now since it only affects whether or not we
set the kernel bit but, if we ever do anything else based on it, we'll
want it to be correct per-gen.

Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
Cc: "17.1" <mesa-stable at lists.freedesktop.org>

---

 src/intel/vulkan/anv_device.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 50486b62e1..b80715f4e2 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -225,7 +225,12 @@ anv_physical_device_init(struct anv_physical_device *device,
       goto fail;
    }
 
-   device->supports_48bit_addresses = anv_gem_supports_48b_addresses(fd);
+   /* The kernel query only tells us whether or not the kernel supports the
+    * EXEC_OBJECT_SUPPORTS_48B_ADDRESS flag and not whether or not the
+    * hardware has actual 48bit address support.
+    */
+   device->supports_48bit_addresses =
+      (device->info.gen >= 8) && anv_gem_supports_48b_addresses(fd);
 
    result = anv_compute_heap_size(fd, &device->heap_size);
    if (result != VK_SUCCESS)