On Fri, 25 Apr 2025, Harry Austen <hpaus...@protonmail.com> wrote:
> 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.
>
> Also, allow DRM_XE_DISPLAY to be built-in. But only as long as DRM_I915
> isn't, since that results in duplicate symbol errors.
>
> Fixes: 08987a8b6820 ("drm/xe: Fix build with KUNIT=m")
> Cc: Lucas De Marchi <lucas.demar...@intel.com>
> Cc: Thomas Hellström <thomas.hellst...@linux.intel.com>
> Cc: Jani Nikula <jani.nik...@linux.intel.com>
> Signed-off-by: Harry Austen <hpaus...@protonmail.com>I didn't test this, but it makes sense to me. Acked-by: Jani Nikula <jani.nik...@intel.com> > --- > v3: Simplify KUNIT dependency, as suggested by Jani Nikula > v2: Ensure DRM_XE_DISPLAY and DRM_I915 can't both be built-in > > drivers/gpu/drm/xe/Kconfig | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig > index 9bce047901b22..214f40264fa12 100644 > --- a/drivers/gpu/drm/xe/Kconfig > +++ b/drivers/gpu/drm/xe/Kconfig > @@ -1,7 +1,8 @@ > # SPDX-License-Identifier: GPL-2.0-only > config DRM_XE > tristate "Intel Xe Graphics" > - depends on DRM && PCI && MMU && (m || (y && KUNIT=y)) > + depends on DRM && PCI && MMU > + depends on KUNIT || KUNIT=n > select INTERVAL_TREE > # we need shmfs for the swappable backing store, and in particular > # the shmem_readpage() which depends upon tmpfs > @@ -51,7 +52,7 @@ config DRM_XE > > config DRM_XE_DISPLAY > bool "Enable display support" > - depends on DRM_XE && DRM_XE=m && HAS_IOPORT > + depends on DRM_XE && (DRM_XE=m || DRM_I915!=y) && HAS_IOPORT > select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION > select I2C > select I2C_ALGOBIT -- Jani Nikula, Intel
