FAILED: patch "[PATCH] drm/xe/display: fix oops in suspend/shutdown without display" failed to apply to 6.12-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 68938cc08e23a94fd881e845837ff918de005ce7
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026061520-pediatric-private-c0b5@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 68938cc08e23a94fd881e845837ff918de005ce7 Mon Sep 17 00:00:00 2001
From: Jani Nikula <[email protected]>
Date: Fri, 15 May 2026 19:09:20 +0300
Subject: [PATCH] drm/xe/display: fix oops in suspend/shutdown without display
The xe driver keeps track of whether to probe display, and whether display hardware is there, using xe->info.probe_display. It gets set to false if there's no display after intel_display_device_probe(). However, the display may also be disabled via fuses, detected at a later time in intel_display_device_info_runtime_init().
In this case, the xe driver does for_each_intel_crtc() on uninitialized mode config in xe_display_flush_cleanup_work(), leading to a NULL pointer dereference, and generally calls display code with display info cleared.
Check for intel_display_device_present() after intel_display_device_info_runtime_init(), and reset xe->info.probe_display as necessary. Also do unset_display_features() for completeness, although display runtime init has already done that. This will need to be unified across all cases later.
Move intel_display_device_info_runtime_init() call slightly earlier, similar to i915, to avoid a bunch of unnecessary setup for no display cases.
Note #1: The xe driver has no business doing low level display plumbing like for_each_intel_crtc() to begin with. It all needs to happen in display code.
Note #2: The actual bug is present already in commit 44e694958b95 ("drm/xe/display: Implement display support"), but the oops was likely introduced later at commit ddf6492e0e50 ("drm/xe/display: Make display suspend/resume work on discrete").
drivers/gpu/drm/xe/display/xe_display.c +9 -2
@@ -124,6 +124,15 @@ int xe_display_init_early(struct xe_device *xe)intel_display_driver_early_probe (display); +intel_display_device_info_runtime_init (display); + +/* Display may have been disabled at runtime init */ +if (!intel_display_device_present (display)) { + xe->info.probe_display = false; +unset_display_features (xe); +return 0 ; + } +/* Early display init.. */ intel_opregion_setup (display);
@@ -137,8 +146,6 @@ int xe_display_init_early(struct xe_device *xe)intel_bw_init_hw (display); -intel_display_device_info_runtime_init (display); - err =intel_display_driver_probe_noirq (display);if (err) goto err_opregion;
Sasha Levin
maintainerPATCH 1/1 drm/xe/display: fix oops in suspend/shutdown without display
From: Jani Nikula <[email protected]>
[ Upstream commit 68938cc08e23a94fd881e845837ff918de005ce7 ]
The xe driver keeps track of whether to probe display, and whether display hardware is there, using xe->info.probe_display. It gets set to false if there's no display after intel_display_device_probe(). However, the display may also be disabled via fuses, detected at a later time in intel_display_device_info_runtime_init().
In this case, the xe driver does for_each_intel_crtc() on uninitialized mode config in xe_display_flush_cleanup_work(), leading to a NULL pointer dereference, and generally calls display code with display info cleared.
Check for intel_display_device_present() after intel_display_device_info_runtime_init(), and reset xe->info.probe_display as necessary. Also do unset_display_features() for completeness, although display runtime init has already done that. This will need to be unified across all cases later.
Move intel_display_device_info_runtime_init() call slightly earlier, similar to i915, to avoid a bunch of unnecessary setup for no display cases.
Note #1: The xe driver has no business doing low level display plumbing like for_each_intel_crtc() to begin with. It all needs to happen in display code.
Note #2: The actual bug is present already in commit 44e694958b95 ("drm/xe/display: Implement display support"), but the oops was likely introduced later at commit ddf6492e0e50 ("drm/xe/display: Make display suspend/resume work on discrete").
--- drivers/gpu/drm/xe/display/xe_display.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/xe/display/xe_display.c +9 -2
@@ -148,6 +148,15 @@ int xe_display_init_noirq(struct xe_device *xe)intel_display_driver_early_probe (xe); +intel_display_device_info_runtime_init (xe); + +/* Display may have been disabled at runtime init */ +if (!has_display (xe)) { + xe->info.probe_display = false; +unset_display_features (xe); +return 0 ; + } +/* Early display init.. */ intel_opregion_setup (display);
@@ -159,8 +168,6 @@ int xe_display_init_noirq(struct xe_device *xe)intel_bw_init_hw (xe); -intel_display_device_info_runtime_init (xe); - err =intel_display_driver_probe_noirq (xe);if (err) {intel_opregion_cleanup (display);
Signature · 1 line
2.53.0