XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add check for pci_device_linux_sysfs_boot_display()

Browse Source 
In the case of multiple display devices that are not VGA devices
the 'boot_display' attribute read by libpciaccess can disambiguate.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2038>
This commit is contained in:
Mario Limonciello
2025-06-23 22:30:46 -05:00
committed by Enrico Weigelt, metux IT consult
parent 6c1c7e4f34
commit d11ce2a42a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/xf86pciBus.c
View File

@@ -111,7 +111,8 @@ xf86PciProbe(void)
xf86PciVideoInfo[num - 1] = info;
pci_device_probe(info);
if (primaryBus.type == BUS_NONE && pci_device_is_boot_vga(info)) {
if (primaryBus.type == BUS_NONE && (pci_device_is_boot_vga(info) ||
pci_device_is_boot_display(info))) {
primaryBus.type = BUS_PCI;
primaryBus.id.pci = info;
}

5
hw/xfree86/common/xf86platformBus.c
View File

@@ -378,7 +378,7 @@ xf86platformProbe(void)
}
}
/* Then check for pci_device_is_boot_vga() */
/* Then check for pci_device_is_boot_vga()/pci_device_is_boot_display() */
for (i = 0; i < xf86_num_platform_devices; i++) {
struct xf86_platform_device *dev = &xf86_platform_devices[i];
@@ -386,7 +386,8 @@ xf86platformProbe(void)
continue;
pci_device_probe(dev->pdev);
if (pci_device_is_boot_vga(dev->pdev)) {
if (pci_device_is_boot_display(dev->pdev) ||
pci_device_is_boot_vga(dev->pdev)) {
primaryBus.type = BUS_PLATFORM;
primaryBus.id.plat = dev;
}