6.18-stable patches

added patches:
	revert-drm-nouveau-disp-set-drm_mode_config_funcs.atomic_-check-commit.patch

diff --git a/queue-6.18/revert-drm-nouveau-disp-set-drm_mode_config_funcs.atomic_-check-commit.patch b/queue-6.18/revert-drm-nouveau-disp-set-drm_mode_config_funcs.atomic_-check-commit.patch
new file mode 100644 (file)
index 0000000..15ab531
--- /dev/null
+++ b/queue-6.18/revert-drm-nouveau-disp-set-drm_mode_config_funcs.atomic_-check-commit.patch
@@ -0,0 +1,54 @@
+From 6c65db809796717f0a96cf22f80405dbc1a31a4b Mon Sep 17 00:00:00 2001
+From: John Ogness <john.ogness@linutronix.de>
+Date: Fri, 30 Jan 2026 12:38:08 +0106
+Subject: Revert "drm/nouveau/disp: Set drm_mode_config_funcs.atomic_(check|commit)"
+
+From: John Ogness <john.ogness@linutronix.de>
+
+commit 6c65db809796717f0a96cf22f80405dbc1a31a4b upstream.
+
+This reverts commit 604826acb3f53c6648a7ee99a3914ead680ab7fb.
+
+Apparently there is more to supporting atomic modesetting than
+providing atomic_(check|commit) callbacks. Before this revert:
+
+WARNING: [] drivers/gpu/drm/drm_plane.c:389 at .__drm_universal_plane_init+0x13c/0x794 [drm], CPU#1: modprobe/1790
+BUG: Kernel NULL pointer dereference on read at 0x00000000
+.drm_atomic_get_plane_state+0xd4/0x210 [drm] (unreliable)
+.drm_client_modeset_commit_atomic+0xf8/0x338 [drm]
+.drm_client_modeset_commit_locked+0x80/0x260 [drm]
+.drm_client_modeset_commit+0x40/0x7c [drm]
+.__drm_fb_helper_restore_fbdev_mode_unlocked.part.0+0xfc/0x108 [drm_kms_helper]
+.drm_fb_helper_set_par+0x8c/0xb8 [drm_kms_helper]
+.fbcon_init+0x31c/0x618
+[...]
+.__drm_fb_helper_initial_config_and_unlock+0x474/0x7f4 [drm_kms_helper]
+.drm_fbdev_client_hotplug+0xb0/0x120 [drm_client_lib]
+.drm_client_register+0x88/0xe4 [drm]
+.drm_fbdev_client_setup+0x12c/0x19b4 [drm_client_lib]
+.drm_client_setup+0x15c/0x18c [drm_client_lib]
+.nouveau_drm_probe+0x19c/0x268 [nouveau]
+
+Fixes: 604826acb3f5 ("drm/nouveau/disp: Set drm_mode_config_funcs.atomic_(check|commit)")
+Reported-by: John Ogness <john.ogness@linutronix.de>
+Closes: https://lore.kernel.org/lkml/87ldhf1prw.fsf@jogness.linutronix.de
+Signed-off-by: John Ogness <john.ogness@linutronix.de>
+Tested-by: Daniel Palmer <daniel@thingy.jp>
+Link: https://patch.msgid.link/20260130113230.2311221-1-john.ogness@linutronix.de
+Signed-off-by: Danilo Krummrich <dakr@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/nouveau/nouveau_display.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/gpu/drm/nouveau/nouveau_display.c
++++ b/drivers/gpu/drm/nouveau/nouveau_display.c
+@@ -351,8 +351,6 @@ nouveau_user_framebuffer_create(struct d
+ 
+ static const struct drm_mode_config_funcs nouveau_mode_config_funcs = {
+       .fb_create = nouveau_user_framebuffer_create,
+-      .atomic_commit = drm_atomic_helper_commit,
+-      .atomic_check = drm_atomic_helper_check,
+ };
+ 
+ 

diff --git a/queue-6.18/series b/queue-6.18/series
index de9186118685d83e0f23addd1506c3222e791133..e40ed227b5264559becf183f957e36d1ac73c50a 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -115,3 +115,4 @@ drm-amdgpu-fix-cond_exec-handling-in-amdgpu_ib_schedule.patch
 iommu-tegra241-cmdqv-reset-vcmdq-in-tegra241_vcmdq_hw_init_user.patch
 gpiolib-acpi-fix-potential-out-of-boundary-left-shift.patch
 libbpf-fix-wdiscarded-qualifiers-under-c23.patch
+revert-drm-nouveau-disp-set-drm_mode_config_funcs.atomic_-check-commit.patch