From: Rob Clark <robclark@freedesktop.org>
Date: Sat, 14 Dec 2013 19:28:33 +0000 (-0500)
Subject: loader: fallback to drmGetVersion() for non-pci devices
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf70c238a72021d61e1464ecc31932c47b7003cc;p=mesa.git

loader: fallback to drmGetVersion() for non-pci devices

Use the kernel driver name are returned by drmGetVersion() for
non-pci(platform) devices.

Signed-off-by: Rob Clark <robclark@freedesktop.org>

v2 (Emil): Rebased and weaked commit message.
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/loader/loader.c b/src/loader/loader.c
index 2f9cfa7c9f9..108e4440291 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -267,8 +267,20 @@ loader_get_driver_for_fd(int fd, unsigned driver_types)
       driver_types = _LOADER_GALLIUM | _LOADER_DRI;
 
    if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) {
-      log(_LOADER_WARNING, "failed to get driver name for fd %d", fd);
-      return NULL;
+      /* fallback to drmGetVersion(): */
+      drmVersionPtr version = drmGetVersion(fd);
+
+      if (!version) {
+         log(_LOADER_WARNING, "failed to get driver name for fd %d", fd);
+         return NULL;
+      }
+
+      driver = strndup(version->name, version->name_len);
+      log(_LOADER_INFO, "using driver %s for %d", driver, fd);
+
+      drmFreeVersion(version);
+
+      return driver;
    }
 
    for (i = 0; driver_map[i].driver; i++) {