fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 23:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

loader: abstract loader_get_kernel_driver_name for reuse

Browse source 
This function can be shared by the following kernel_driver
drirc patch.

Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Qiang Yu 2018-08-06 11:19:25 +08:00 • committed by Emil Velikov
parent 30b10dbb7c
commit e8b91e99e9
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/loader/loader.c
View file

@ -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;
}