From: Jordan Justen <jordan.l.justen@intel.com>
Date: Sat, 10 Feb 2018 02:38:28 +0000 (-0800)
Subject: intel/vulkan: Support INTEL_DEVID_OVERRIDE environment variable
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c2134f94c8a819cd100e503cf56cbe6fe11a6a2f;p=mesa.git

intel/vulkan: Support INTEL_DEVID_OVERRIDE environment variable

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

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index dd5f2f49286..8be88acc52c 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);