[Intel-xe] [PATCH] fixup! drm/xe: Introduce a new DRM driver for Intel GPUs

[Intel-xe] [PATCH] fixup! drm/xe: Introduce a new DRM driver for Intel GPUs

[Lucas De Marchi]

Introduced with the 6.2 rebase due to
commit 000458b5966f ("drm: Only select I2C_ALGOBIT for drivers that
actually need it"). Make a similar selection when CONFIG_DRM_XE_DISPLAY
is enabled. Also, provide this as a fixup-only commit, to be squashed in
the next rebase. With this, the following command works again:

	./tools/testing/kunit/kunit.py build \
		--kunitconfig drivers/gpu/drm/xe/.kunitconfig

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/xe/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
index 4684e99549d3..aeaf3ce19c4f 100644
--- a/drivers/gpu/drm/xe/Kconfig
+++ b/drivers/gpu/drm/xe/Kconfig
@@ -44,6 +44,8 @@ config DRM_XE
 config DRM_XE_DISPLAY
 	bool "Enable display support"
 	depends on DRM_XE && EXPERT
+	select I2C
+	select I2C_ALGOBIT
 	default y
 	help
 	  Disable this option only if you want to compile out display support.
-- 
2.39.0

[Intel-xe] ✓ CI.Patch_applied: success for fixup! drm/xe: Introduce a new DRM driver for Intel GPUs

[Patchwork]

== Series Details ==

Series: fixup! drm/xe: Introduce a new DRM driver for Intel GPUs
URL   : https://patchwork.freedesktop.org/series/115290/
State : success

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: ===
commit 68c0f7421b74cf51fe442bed6d4395d28ded5d7d
Author:     Thomas Hellström <thomas.hellstrom@linux.intel.com>
AuthorDate: Tue Mar 14 15:56:44 2023 +0100
Commit:     Thomas Hellström <thomas.hellstrom@linux.intel.com>
CommitDate: Thu Mar 16 15:16:00 2023 +0100

    drm/xe/vm: Defer vm rebind until next exec if nothing to execute
    
    If all compute engines of a vm in compute mode are idle,
    defer a rebind to the next exec to avoid the VM unnecessarily trying
    to make memory resident and compete with other VMs for available
    memory space.
    
    Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
    Reviewed-by: Matthew Brost <matthew.brost@intel.com>
=== git am output follows ===
Applying: fixup! drm/xe: Introduce a new DRM driver for Intel GPUs

[Intel-xe] ✗ CI.KUnit: failure for fixup! drm/xe: Introduce a new DRM driver for Intel GPUs

[Patchwork]

== Series Details ==

Series: fixup! drm/xe: Introduce a new DRM driver for Intel GPUs
URL   : https://patchwork.freedesktop.org/series/115290/
State : failure

== Summary ==

+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
ERROR:root:`.exit.text' referenced in section `.uml.exitcall.exit' of arch/um/drivers/virtio_uml.o: defined in discarded section `.exit.text' of arch/um/drivers/virtio_uml.o
collect2: error: ld returned 1 exit status
make[2]: *** [../scripts/Makefile.vmlinux:35: vmlinux] Error 1
make[1]: *** [/kernel/Makefile:1264: vmlinux] Error 2
make: *** [Makefile:242: __sub-make] Error 2

[18:32:38] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[18:32:42] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make ARCH=um O=.kunit --jobs=48
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel

Re: [Intel-xe] ✗ CI.KUnit: failure for fixup! drm/xe: Introduce a new DRM driver for Intel GPUs

[Lucas De Marchi]

On Thu, Mar 16, 2023 at 06:33:06PM -0000, Patchwork wrote:
>== Series Details ==
>
>Series: fixup! drm/xe: Introduce a new DRM driver for Intel GPUs
>URL   : https://patchwork.freedesktop.org/series/115290/
>State : failure
>
>== Summary ==
>
>+ trap cleanup EXIT
>+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
>ERROR:root:`.exit.text' referenced in section `.uml.exitcall.exit' of arch/um/drivers/virtio_uml.o: defined in discarded section `.exit.text' of arch/um/drivers/virtio_uml.o
>collect2: error: ld returned 1 exit status
>make[2]: *** [../scripts/Makefile.vmlinux:35: vmlinux] Error 1
>make[1]: *** [/kernel/Makefile:1264: vmlinux] Error 2
>make: *** [Makefile:242: __sub-make] Error 2

passes for me... it seems to be because of the toolchain currently used:

https://lore.kernel.org/all/20230207164156.537378-1-masahiroy@kernel.org/

it's on 6.3-rc1 and 6.2.7

Lucas De Marchi

>
>[18:32:38] Configuring KUnit Kernel ...
>Generating .config ...
>Populating config with:
>$ make ARCH=um O=.kunit olddefconfig
>[18:32:42] Building KUnit Kernel ...
>Populating config with:
>$ make ARCH=um O=.kunit olddefconfig
>Building with:
>$ make ARCH=um O=.kunit --jobs=48
>+ cleanup
>++ stat -c %u:%g /kernel
>+ chown -R 1003:1003 /kernel
>
>

Re: [Intel-xe] [PATCH] fixup! drm/xe: Introduce a new DRM driver for Intel GPUs

[Mauro Carvalho Chehab]

On 3/16/23 19:29, Lucas De Marchi wrote:
> Introduced with the 6.2 rebase due to
> commit 000458b5966f ("drm: Only select I2C_ALGOBIT for drivers that
> actually need it"). Make a similar selection when CONFIG_DRM_XE_DISPLAY
> is enabled. Also, provide this as a fixup-only commit, to be squashed in
> the next rebase. With this, the following command works again:
>
> 	./tools/testing/kunit/kunit.py build \
> 		--kunitconfig drivers/gpu/drm/xe/.kunitconfig
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Yeah, selecting I2C and I2C_ALGOBIT is something that needs to be done 
on each driver.

Doing such kind of things subsystem-wide doesn't sound right. So, LGTM.

Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>

> ---
>   drivers/gpu/drm/xe/Kconfig | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
> index 4684e99549d3..aeaf3ce19c4f 100644
> --- a/drivers/gpu/drm/xe/Kconfig
> +++ b/drivers/gpu/drm/xe/Kconfig
> @@ -44,6 +44,8 @@ config DRM_XE
>   config DRM_XE_DISPLAY
>   	bool "Enable display support"
>   	depends on DRM_XE && EXPERT
> +	select I2C
> +	select I2C_ALGOBIT
>   	default y
>   	help
>   	  Disable this option only if you want to compile out display support.