Skip to content

Commit 2182f35

Browse files
arndbThomas Hellström
authored andcommitted
drm/xe/vsec: fix CONFIG_INTEL_VSEC dependency
The XE driver can be built with or without VSEC support, but fails to link as built-in if vsec is in a loadable module: x86_64-linux-ld: vmlinux.o: in function `xe_vsec_init': (.text+0x1e83e16): undefined reference to `intel_vsec_register' The normal fix for this is to add a 'depends on INTEL_VSEC || !INTEL_VSEC', forcing XE to be a loadable module as well, but that causes a circular dependency: symbol DRM_XE depends on INTEL_VSEC symbol INTEL_VSEC depends on X86_PLATFORM_DEVICES symbol X86_PLATFORM_DEVICES is selected by DRM_XE The problem here is selecting a symbol from another subsystem, so change that as well and rephrase the 'select' into the corresponding dependency. Since X86_PLATFORM_DEVICES is 'default y', there is no change to defconfig builds here. Fixes: 0c45e76 ("drm/xe/vsec: Support BMG devices") Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: Lucas De Marchi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lucas De Marchi <[email protected]> (cherry picked from commit e4931f8) Signed-off-by: Thomas Hellström <[email protected]>
1 parent 9411082 commit 2182f35

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/xe/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
config DRM_XE
33
tristate "Intel Xe Graphics"
44
depends on DRM && PCI && MMU && (m || (y && KUNIT=y))
5+
depends on INTEL_VSEC || !INTEL_VSEC
6+
depends on X86_PLATFORM_DEVICES || !(X86 && ACPI)
57
select INTERVAL_TREE
68
# we need shmfs for the swappable backing store, and in particular
79
# the shmem_readpage() which depends upon tmpfs
@@ -27,7 +29,6 @@ config DRM_XE
2729
select BACKLIGHT_CLASS_DEVICE if ACPI
2830
select INPUT if ACPI
2931
select ACPI_VIDEO if X86 && ACPI
30-
select X86_PLATFORM_DEVICES if X86 && ACPI
3132
select ACPI_WMI if X86 && ACPI
3233
select SYNC_FILE
3334
select IOSF_MBI

0 commit comments

Comments
 (0)