fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-04 02:27:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'superm1/boot_display' into 'master'

Browse source 
Add check for `pci_device_linux_sysfs_boot_display()`

See merge request xorg/xserver!2038
This commit is contained in:
Mario Limonciello 2026-01-30 02:08:36 -06:00
commit b66228f7da
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -109,7 +109,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

@ -353,7 +353,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];
@ -361,7 +361,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;
}

7
hw/xfree86/common/xf86platformBus.h
View file

@ -136,4 +136,11 @@ static inline void xf86MergeOutputClassOptions(int index, void **options) {}
#endif
#ifndef pci_device_is_boot_display
static inline Bool pci_device_is_boot_display(struct pci_device *dev)
{
return FALSE;
}
#endif
#endif