Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / loader / loader.c

diff --git a/src/loader/loader.c b/src/loader/loader.c
index 1a438a4fcc76695af1a789a88394d7eec49983e7..38395c8b768f1bbd35807b9bb9bcba68cc5ec313 100644 (file)
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -53,7 +53,7 @@
 #define MAX_DRM_DEVICES 64
 #ifdef USE_DRICONF
 #include "util/xmlconfig.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
 #endif
 #endif
 
@@ -111,6 +111,8 @@ static char *loader_get_kernel_driver_name(int fd)
    }
 
    driver = strndup(version->name, version->name_len);
+   log_(driver ? _LOADER_DEBUG : _LOADER_WARNING, "using driver %s for %d\n",
+        driver, fd);
 
    drmFreeVersion(version);
    return driver;
@@ -193,7 +195,7 @@ static char *loader_get_dri_config_driver(int fd)
 
    driParseOptionInfo(&defaultInitOptions, __driConfigOptionsLoader);
    driParseConfigFiles(&userInitOptions, &defaultInitOptions, 0,
-                       "loader", kernel_driver, NULL, 0);
+                       "loader", kernel_driver, NULL, 0, NULL, 0);
    if (driCheckOption(&userInitOptions, "dri_driver", DRI_STRING)) {
       char *opt = driQueryOptionstr(&userInitOptions, "dri_driver");
       /* not an empty string */
@@ -215,7 +217,7 @@ static char *loader_get_dri_config_device_id(void)
 
    driParseOptionInfo(&defaultInitOptions, __driConfigOptionsLoader);
    driParseConfigFiles(&userInitOptions, &defaultInitOptions, 0,
-                       "loader", NULL, NULL, 0);
+                       "loader", NULL, NULL, 0, NULL, 0);
    if (driCheckOption(&userInitOptions, "device_id", DRI_STRING))
       prime = strdup(driQueryOptionstr(&userInitOptions, "device_id"));
    driDestroyOptionCache(&userInitOptions);
@@ -385,26 +387,22 @@ static bool
 drm_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
 {
    drmDevicePtr device;
-   bool ret;
 
-   if (drmGetDevice2(fd, 0, &device) == 0) {
-      if (device->bustype == DRM_BUS_PCI) {
-         *vendor_id = device->deviceinfo.pci->vendor_id;
-         *chip_id = device->deviceinfo.pci->device_id;
-         ret = true;
-      }
-      else {
-         log_(_LOADER_DEBUG, "MESA-LOADER: device is not located on the PCI bus\n");
-         ret = false;
-      }
-      drmFreeDevice(&device);
-   }
-   else {
+   if (drmGetDevice2(fd, 0, &device) != 0) {
       log_(_LOADER_WARNING, "MESA-LOADER: failed to retrieve device information\n");
-      ret = false;
+      return false;
+   }
+
+   if (device->bustype != DRM_BUS_PCI) {
+      drmFreeDevice(&device);
+      log_(_LOADER_DEBUG, "MESA-LOADER: device is not located on the PCI bus\n");
+      return false;
    }
 
-   return ret;
+   *vendor_id = device->deviceinfo.pci->vendor_id;
+   *chip_id = device->deviceinfo.pci->device_id;
+   drmFreeDevice(&device);
+   return true;
 }
 #endif
 
@@ -430,35 +428,14 @@ loader_get_device_name_for_fd(int fd)
    return result;
 }
 
-char *
-loader_get_driver_for_fd(int fd)
+static char *
+loader_get_pci_driver(int fd)
 {
    int vendor_id, chip_id, i, j;
    char *driver = NULL;
 
-   /* Allow an environment variable to force choosing a different driver
-    * binary.  If that driver binary can't survive on this FD, that's the
-    * user's problem, but this allows vc4 simulator to run on an i965 host,
-    * and may be useful for some touch testing of i915 on an i965 host.
-    */
-   if (geteuid() == getuid()) {
-      driver = getenv("MESA_LOADER_DRIVER_OVERRIDE");
-      if (driver)
-         return strdup(driver);
-   }
-
-#if defined(HAVE_LIBDRM) && defined(USE_DRICONF)
-   driver = loader_get_dri_config_driver(fd);
-   if (driver)
-      return driver;
-#endif
-
-   if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) {
-      driver = loader_get_kernel_driver_name(fd);
-      if (driver)
-         log_(_LOADER_INFO, "using driver %s for %d\n", driver, fd);
-      return driver;
-   }
+   if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id))
+      return NULL;
 
    for (i = 0; i < ARRAY_SIZE(driver_map); i++) {
       if (vendor_id != driver_map[i].vendor_id)
@@ -486,6 +463,35 @@ out:
    return driver;
 }
 
+char *
+loader_get_driver_for_fd(int fd)
+{
+   char *driver;
+
+   /* Allow an environment variable to force choosing a different driver
+    * binary.  If that driver binary can't survive on this FD, that's the
+    * user's problem, but this allows vc4 simulator to run on an i965 host,
+    * and may be useful for some touch testing of i915 on an i965 host.
+    */
+   if (geteuid() == getuid()) {
+      driver = getenv("MESA_LOADER_DRIVER_OVERRIDE");
+      if (driver)
+         return strdup(driver);
+   }
+
+#if defined(HAVE_LIBDRM) && defined(USE_DRICONF)
+   driver = loader_get_dri_config_driver(fd);
+   if (driver)
+      return driver;
+#endif
+
+   driver = loader_get_pci_driver(fd);
+   if (!driver)
+      driver = loader_get_kernel_driver_name(fd);
+
+   return driver;
+}
+
 void
 loader_set_logger(loader_logger *logger)
 {