From bf70c238a72021d61e1464ecc31932c47b7003cc Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sat, 14 Dec 2013 14:28:33 -0500 Subject: [PATCH] loader: fallback to drmGetVersion() for non-pci devices MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use the kernel driver name are returned by drmGetVersion() for non-pci(platform) devices. Signed-off-by: Rob Clark v2 (Emil): Rebased and weaked commit message. Reviewed-by: Rob Clark Reviewed-by: Kristian Høgsberg Reviewed-by: Ian Romanick --- 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 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++) { -- 2.30.2