Commit e73c2262 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/xe-vfio-2025-12-04' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next 



Driver Changes:
- fix VFIO link error for built-in xe module (Arnd Bergmann)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patch.msgid.link/aTIA9in2Bo_fA9TN@fedora
parents 55a271a0 e45b5df4

drivers/gpu/drm/xe/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ xe-$(CONFIG_PCI_IOV) += \ 
	xe_sriov_pf_sysfs.o \

	xe_tile_sriov_pf_debugfs.o



ifeq ($(CONFIG_PCI_IOV),y)

	xe-$(CONFIG_XE_VFIO_PCI) += xe_sriov_vfio.o

ifdef CONFIG_XE_VFIO_PCI

	xe-$(CONFIG_PCI_IOV) += xe_sriov_vfio.o

endif



# include helpers for tests even when XE is built-in