Mesa (master): intel/vulkan: Support INTEL_DEVID_OVERRIDE environment variable

[Jordan Justen]

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

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Fri Feb  9 18:38:28 2018 -0800

intel/vulkan: Support INTEL_DEVID_OVERRIDE environment variable

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
Reviewed-by: Scott D Phillips <scott.d.phillips at intel.com>

---

 src/intel/vulkan/anv_device.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index dd5f2f4928..8be88acc52 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -296,10 +296,16 @@ anv_physical_device_init(struct anv_physical_device *device,
 
    device->no_hw = getenv("INTEL_NO_HW") != NULL;
 
-   device->chipset_id = anv_gem_get_param(fd, I915_PARAM_CHIPSET_ID);
-   if (!device->chipset_id) {
-      result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
-      goto fail;
+   const int pci_id_override = gen_get_pci_device_id_override();
+   if (pci_id_override < 0) {
+      device->chipset_id = anv_gem_get_param(fd, I915_PARAM_CHIPSET_ID);
+      if (!device->chipset_id) {
+         result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
+         goto fail;
+      }
+   } else {
+      device->chipset_id = pci_id_override;
+      device->no_hw = true;
    }
 
    device->name = gen_get_device_name(device->chipset_id);