From: Qiang Yu Date: Mon, 6 Aug 2018 03:19:25 +0000 (+0800) Subject: loader: abstract loader_get_kernel_driver_name for reuse X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e8b91e99e9965fa717be25da66fba0cdc3aef5dc;p=mesa.git loader: abstract loader_get_kernel_driver_name for reuse This function can be shared by the following kernel_driver drirc patch. Signed-off-by: Qiang Yu Acked-by: Michel Dänzer Reviewed-by: Emil Velikov --- diff --git a/src/loader/loader.c b/src/loader/loader.c index fda49521aae..28a4c5855c9 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -82,6 +82,26 @@ loader_open_device(const char *device_name) return fd; } +static char *loader_get_kernel_driver_name(int fd) +{ +#if HAVE_LIBDRM + char *driver; + drmVersionPtr version = drmGetVersion(fd); + + if (!version) { + log_(_LOADER_WARNING, "failed to get driver name for fd %d\n", fd); + return NULL; + } + + driver = strndup(version->name, version->name_len); + + drmFreeVersion(version); + return driver; +#else + return NULL; +#endif +} + #if defined(HAVE_LIBDRM) #ifdef USE_DRICONF static const char __driConfigOptionsLoader[] = @@ -339,22 +359,9 @@ loader_get_driver_for_fd(int fd) } if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) { - -#if HAVE_LIBDRM - /* fallback to drmGetVersion(): */ - drmVersionPtr version = drmGetVersion(fd); - - if (!version) { - log_(_LOADER_WARNING, "failed to get driver name for fd %d\n", fd); - return NULL; - } - - driver = strndup(version->name, version->name_len); - log_(_LOADER_INFO, "using driver %s for %d\n", driver, fd); - - drmFreeVersion(version); -#endif - + driver = loader_get_kernel_driver_name(fd); + if (driver) + log_(_LOADER_INFO, "using driver %s for %d\n", driver, fd); return driver; }