Skip to content

(release/25.1) Add check for pci_device_linux_sysfs_boot_display() #2270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metux wants to merge 2 commits into
base: release/25.1
Choose a base branch
from
+12 −3
Open

(release/25.1) Add check for pci_device_linux_sysfs_boot_display() #2270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9ffc53
Add check for `pci_device_linux_sysfs_boot_display()`
superm1 Jun 24, 2025
7b6b630
xfree86: common: xf86pciBus: Add compatibility define for `pci_device…
superm1 Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion hw/xfree86/common/xf86pciBus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 3 additions & 2 deletions hw/xfree86/common/xf86platformBus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,15 +378,16 @@ 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];

if (!dev->pdev)
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;
}
Expand Down
7 changes: 7 additions & 0 deletions hw/xfree86/common/xf86platformBus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,11 @@ xf86PlatformDeviceCheckBusID(struct xf86_platform_device *device, const char *bu

#endif

#ifndef pci_device_is_boot_display
static inline Bool pci_device_is_boot_display(struct pci_device *dev)
{
return FALSE;
}
#endif

#endif
Loading