This is a note to let you know that I've just added the patch titled
drm/amd/display: disable seamless boot if force_odm_combine is enabled
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-disable-seamless-boot-if-force_odm_combine-is-enabled.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 26518b39181876064850209ecdab48c0ee5924b1 Mon Sep 17 00:00:00 2001
From: Leo Chen <sancchen@xxxxxxx>
Date: Thu, 8 Jun 2023 16:37:38 -0400
Subject: drm/amd/display: disable seamless boot if force_odm_combine is enabled
From: Leo Chen <sancchen@xxxxxxx>
commit 26518b39181876064850209ecdab48c0ee5924b1 upstream.
[Why & How]
Having seamless boot on while forcing debug option ODM combine 2 to 1
will cause some corruptions because of some missing programmings.
Cc: stable@xxxxxxxxxxxxxxx # 6.1+
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@xxxxxxx>
Acked-by: Hamza Mahfooz <hamza.mahfooz@xxxxxxx>
Signed-off-by: Leo Chen <sancchen@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +++
1 file changed, 3 insertions(+)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1539,6 +1539,9 @@ bool dc_validate_boot_timing(const struc
return false;
}
+ if (dc->debug.force_odm_combine)
+ return false;
+
/* Check for enabled DIG to identify enabled display */
if (!link->link_enc->funcs->is_dig_enabled(link->link_enc))
return false;
Patches currently in stable-queue which might be from sancchen@xxxxxxx are
queue-6.1/drm-amd-display-disable-seamless-boot-if-force_odm_combine-is-enabled.patch
