commit 4d09f45eca56a8e64a15dc9169244c5bf02d5335
author Chia-I Wu <olv@lunarg.com> Mon Oct 13 16:21:39 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Oct 13 11:41:30 2014 -0600
tree e19dc40740c450e9cc1204ae2c0f7b88a11f22c5
parent 8f6043ab5661197c377f1c041a6f0958720dde13

intel: fix devid override

icd/intel/intel.c

diff --git a/icd/intel/intel.c b/icd/intel/intel.c
index f7b83b9..106f1eb 100644
--- a/icd/intel/intel.c
+++ b/icd/intel/intel.c
@@ -103,6 +103,7 @@
     dev = devices;
     while (dev) {
         const char *primary_node, *render_node;
+        int devid;
         struct intel_gpu *gpu;
 
         primary_node = icd_drm_get_devnode(dev, ICD_DRM_MINOR_LEGACY);
@@ -111,7 +112,8 @@
 
         render_node = icd_drm_get_devnode(dev, ICD_DRM_MINOR_RENDER);
 
-        ret = intel_gpu_add(dev->devid, primary_node, render_node, &gpu);
+        devid = (intel_devid_override) ? intel_devid_override : dev->devid;
+        ret = intel_gpu_add(devid, primary_node, render_node, &gpu);
         if (ret == XGL_SUCCESS) {
             pGpus[count++] = (XGL_PHYSICAL_GPU) gpu;
             if (count >= maxGpus)