diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h index c445ed84e..cd616ea85 100644 --- a/hw/xfree86/common/xf86platformBus.h +++ b/hw/xfree86/common/xf86platformBus.h @@ -165,4 +165,11 @@ static inline void xf86MergeOutputClassOptions(int index, void **options) {} #endif +#ifndef HAVE_PCI_DEVICE_IS_BOOT_DISPLAY +static inline Bool pci_device_is_boot_display(struct pci_device *dev) +{ + return FALSE; +} +#endif + #endif diff --git a/include/meson.build b/include/meson.build index c76017550..129a42538 100644 --- a/include/meson.build +++ b/include/meson.build @@ -330,6 +330,11 @@ conf_data.set('PCVT_SUPPORT', supports_pcvt ? '1' : false) conf_data.set('SYSCONS_SUPPORT', supports_syscons ? '1' : false) conf_data.set('WSCONS_SUPPORT', supports_wscons ? '1' : false) conf_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess') ? '1' : false) +if get_option('pciaccess') + pciaccess_dep = dependency('pciaccess', required: build_xorg) + conf_data.set('HAVE_PCI_DEVICE_IS_BOOT_DISPLAY', + cc.has_function('pci_device_is_boot_display', dependencies: pciaccess_dep) ? '1' : false) +endif conf_data.set('XSERVER_PLATFORM_BUS', build_udev_kms ? '1' : false) configure_file(output : 'dix-config.h',