AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loader: simplify codeflow in drm_get_pci_id_for_fd

Browse Source 
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4084>
This commit is contained in:
Emil Velikov
2020-03-05 13:50:46 +00:00
committed by Emil Velikov
parent 164f4a9a4a
commit e3572f977f
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/loader/loader.c
+12 -16
View File
@@ -385,26 +385,22 @@ static bool
drm_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
{
drmDevicePtr device;
bool ret;
if (drmGetDevice2(fd, 0, &device) == 0) {
if (device->bustype == DRM_BUS_PCI) {
*vendor_id = device->deviceinfo.pci->vendor_id;
*chip_id = device->deviceinfo.pci->device_id;
ret = true;
}
else {
log_(_LOADER_DEBUG, "MESA-LOADER: device is not located on the PCI bus\n");
ret = false;
}
drmFreeDevice(&device);
}
else {
if (drmGetDevice2(fd, 0, &device) != 0) {
log_(_LOADER_WARNING, "MESA-LOADER: failed to retrieve device information\n");
ret = false;
return false;
}
return ret;
if (device->bustype != DRM_BUS_PCI) {
drmFreeDevice(&device);
log_(_LOADER_DEBUG, "MESA-LOADER: device is not located on the PCI bus\n");
return false;
}
*vendor_id = device->deviceinfo.pci->vendor_id;
*chip_id = device->deviceinfo.pci->device_id;
drmFreeDevice(&device);
return true;
}
#endif