The patch below does not apply to the 6.1-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 stable@vger.kernel.org.
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.1.y git checkout FETCH_HEAD git cherry-pick -x ef013f6fcd8affaae4a5bf4b51cb6244c8a2ed3f # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023112402-extending-trapeze-1f68@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
ef013f6fcd8a ("drm/amd/display: Don't set dpms_off for seamless boot")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ef013f6fcd8affaae4a5bf4b51cb6244c8a2ed3f Mon Sep 17 00:00:00 2001 From: Daniel Miess daniel.miess@amd.com Date: Fri, 29 Sep 2023 13:04:33 -0400 Subject: [PATCH] drm/amd/display: Don't set dpms_off for seamless boot
[Why] eDPs fail to light up with seamless boot enabled
[How] When seamless boot is enabled don't configure dpms_off in disable_vbios_mode_if_required.
Reviewed-by: Charlene Liu charlene.liu@amd.com Cc: Mario Limonciello mario.limonciello@amd.com Cc: Alex Deucher alexander.deucher@amd.com Cc: stable@vger.kernel.org Acked-by: Tom Chung chiahsuan.chung@amd.com Signed-off-by: Daniel Miess daniel.miess@amd.com Tested-by: Daniel Wheeler daniel.wheeler@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index f9aac215ef1f..00d6fce5b766 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1232,6 +1232,9 @@ static void disable_vbios_mode_if_required( if (stream == NULL) continue;
+ if (stream->apply_seamless_boot_optimization) + continue; + // only looking for first odm pipe if (pipe->prev_odm_pipe) continue;