[PATCH] drm/xe: Allow building as kernel built-in

[PATCH] drm/xe: Allow building as kernel built-in

[Harry Austen]

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>
Signed-off-by: Harry Austen <hpausten@protonmail.com>
---
 drivers/gpu/drm/xe/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
index 9bce047901b22..b65bd6b9e65d4 100644
--- a/drivers/gpu/drm/xe/Kconfig
+++ b/drivers/gpu/drm/xe/Kconfig
@@ -1,7 +1,7 @@
 # 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 && (m || (y && KUNIT!=m))
 	select INTERVAL_TREE
 	# we need shmfs for the swappable backing store, and in particular
 	# the shmem_readpage() which depends upon tmpfs
@@ -51,7 +51,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 && HAS_IOPORT
 	select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION
 	select I2C
 	select I2C_ALGOBIT
-- 
2.49.0

Re: [PATCH] drm/xe: Allow building as kernel built-in

[Lucas De Marchi]

On Sat, Apr 12, 2025 at 10:07:21PM +0000, Harry Austen 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.
>
>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>
>Signed-off-by: Harry Austen <hpausten@protonmail.com>
>---
> drivers/gpu/drm/xe/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
>index 9bce047901b22..b65bd6b9e65d4 100644
>--- a/drivers/gpu/drm/xe/Kconfig
>+++ b/drivers/gpu/drm/xe/Kconfig
>@@ -1,7 +1,7 @@
> # 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 && (m || (y && KUNIT!=m))
> 	select INTERVAL_TREE
> 	# we need shmfs for the swappable backing store, and in particular
> 	# the shmem_readpage() which depends upon tmpfs
>@@ -51,7 +51,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 && HAS_IOPORT

this wouldn't work with i915 also built-in. Does it now?

Lucas De Marchi

✗ LGCI.VerificationFailed: failure for drm/xe: Allow building as kernel built-in

[Patchwork]

== Series Details ==

Series: drm/xe: Allow building as kernel built-in
URL   : https://patchwork.freedesktop.org/series/147701/
State : failure

== Summary ==

Address 'hpausten@protonmail.com' is not on the allowlist!
Exception occurred during validation, bailing out!

Re: [PATCH] drm/xe: Allow building as kernel built-in

[Harry Austen]

On Mon Apr 14, 2025 at 5:00 PM BST, Lucas De Marchi wrote:
> On Sat, Apr 12, 2025 at 10:07:21PM +0000, Harry Austen 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.
>>
>>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>
>>Signed-off-by: Harry Austen <hpausten@protonmail.com>
>>---
>> drivers/gpu/drm/xe/Kconfig | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
>>index 9bce047901b22..b65bd6b9e65d4 100644
>>--- a/drivers/gpu/drm/xe/Kconfig
>>+++ b/drivers/gpu/drm/xe/Kconfig
>>@@ -1,7 +1,7 @@
>> # 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 && (m || (y && KUNIT!=m))
>> 	select INTERVAL_TREE
>> 	# we need shmfs for the swappable backing store, and in particular
>> 	# the shmem_readpage() which depends upon tmpfs
>>@@ -51,7 +51,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 && HAS_IOPORT
>
> this wouldn't work with i915 also built-in. Does it now?

Ah. Just gave this a go and it doesn't work, as you suggest. Perhaps I need
to change this to something like the following?:

depends on DRM_XE && (DRM_XE=m || DRM_I915!=y) && HAS_IOPORT

>
> Lucas De Marchi

Thanks for the review!
Harry

Re: [PATCH] drm/xe: Allow building as kernel built-in

[Jani Nikula]

On Mon, 14 Apr 2025, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Sat, Apr 12, 2025 at 10:07:21PM +0000, Harry Austen 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.
>>
>>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>
>>Signed-off-by: Harry Austen <hpausten@protonmail.com>
>>---
>> drivers/gpu/drm/xe/Kconfig | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
>>index 9bce047901b22..b65bd6b9e65d4 100644
>>--- a/drivers/gpu/drm/xe/Kconfig
>>+++ b/drivers/gpu/drm/xe/Kconfig
>>@@ -1,7 +1,7 @@
>> # 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 && (m || (y && KUNIT!=m))
>> 	select INTERVAL_TREE
>> 	# we need shmfs for the swappable backing store, and in particular
>> 	# the shmem_readpage() which depends upon tmpfs
>>@@ -51,7 +51,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 && HAS_IOPORT
>
> this wouldn't work with i915 also built-in. Does it now?

I don't think so.

BR,
Jani.

-- 
Jani Nikula, Intel