]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/xe: Allow dropping kunit dependency as built-in
authorHarry Austen <hpausten@protonmail.com>
Fri, 27 Jun 2025 20:30:35 +0000 (13:30 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Tue, 1 Jul 2025 20:59:02 +0000 (13:59 -0700)
Fix Kconfig symbol dependency on KUNIT, which isn't actually required
for XE to be built-in. However, if KUNIT is enabled, it must be built-in
too.

Fixes: 08987a8b6820 ("drm/xe: Fix build with KUNIT=m")
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Harry Austen <hpausten@protonmail.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/r/20250627-xe-kunit-v2-2-756fe5cd56cf@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
(cherry picked from commit a559434880b320b83733d739733250815aecf1b0)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/Kconfig

index 884a3199b5be41b12456670005f56584f6307fb9..99a91355842ec3323e4401a2a79bd4c644732b56 100644 (file)
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DRM_XE
        tristate "Intel Xe2 Graphics"
-       depends on DRM && PCI && (m || (y && KUNIT=y))
+       depends on DRM && PCI
+       depends on KUNIT || !KUNIT
        depends on INTEL_VSEC || !INTEL_VSEC
        depends on X86_PLATFORM_DEVICES || !(X86 && ACPI)
        select INTERVAL_TREE