Mesa (loader-v4): loader: fallback to drmGetVersion() for non-pci devices
Emil Velikov
evelikov at kemper.freedesktop.org
Sat Jan 18 18:58:27 UTC 2014
Module: Mesa
Branch: loader-v4
Commit: bf70c238a72021d61e1464ecc31932c47b7003cc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf70c238a72021d61e1464ecc31932c47b7003cc
Author: Rob Clark <robclark at freedesktop.org>
Date: Sat Dec 14 14:28:33 2013 -0500
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 at freedesktop.org>
v2 (Emil): Rebased and weaked commit message.
Reviewed-by: Rob Clark <robdclark at gmail.com>
Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/loader/loader.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/loader/loader.c b/src/loader/loader.c
index 2f9cfa7..108e444 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++) {
More information about the mesa-commit
mailing list