geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xf86drm: fix subsystem type lookup for virtio mmio-based devices 

Currently the code assumes that a virtio based device is always located
on the PCI bus.

Modify the parser to make it check the device's parent directory to
determine on which bus it is located.

Output for virtio-pci is the PCI bus.
Output for virtio-mmio is the Platform bus.

Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
Signed-off-by: Mikhail Golubev <Mikhail.Golubev@opensynergy.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
main
Vasyl Vavrychuk 2020-01-29 16:08:41 +01:00 committed by Kristian H. Kristensen
parent c4eae71d7e
commit 8a73372e62
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xf86drm.c
View File

@ -3005,10 +3005,20 @@ static int drmParseSubsystemType(int maj, int min)
{ {
#ifdef __linux__ #ifdef __linux__
char path[PATH_MAX + 1] = ""; char path[PATH_MAX + 1] = "";
char real_path[PATH_MAX + 1] = "";
int subsystem_type;
snprintf(path, PATH_MAX, "/sys/dev/char/%d:%d/device", maj, min); snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device", maj, min);
if (!realpath(path, real_path))
return -errno;
snprintf(path, sizeof(path), "%s", real_path);
return get_subsystem_type(path); subsystem_type = get_subsystem_type(path);
if (subsystem_type == DRM_BUS_VIRTIO) {
strncat(path, "/..", PATH_MAX);
subsystem_type = get_subsystem_type(path);
}
return subsystem_type;
#elif defined(__OpenBSD__) || defined(__DragonFly__) #elif defined(__OpenBSD__) || defined(__DragonFly__)
return DRM_BUS_PCI; return DRM_BUS_PCI;
#else #else
@ -3710,7 +3720,6 @@ process_device(drmDevicePtr *device, const char *d_name,
switch (subsystem_type) { switch (subsystem_type) {
case DRM_BUS_PCI: case DRM_BUS_PCI:
case DRM_BUS_VIRTIO:
return drmProcessPciDevice(device, node, node_type, maj, min, return drmProcessPciDevice(device, node, node_type, maj, min,
fetch_deviceinfo, flags); fetch_deviceinfo, flags);
case DRM_BUS_USB: case DRM_BUS_USB: