This is a note to let you know that I've just added the patch titled
drm/amd/display: Handle seamless boot stream
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-handle-seamless-boot-stream.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 stable-owner@xxxxxxxxxxxxxxx Fri Aug 11 23:09:25 2023
From: Mario Limonciello <mario.limonciello@xxxxxxx>
Date: Fri, 11 Aug 2023 16:07:01 -0500
Subject: drm/amd/display: Handle seamless boot stream
To: <stable@xxxxxxxxxxxxxxx>
Cc: <Tianci.Yin@xxxxxxx>, <Richard.Gong@xxxxxxx>, <Aurabindo.Pillai@xxxxxxx>, Mario Limonciello <mario.limonciello@xxxxxxx>
Message-ID: <20230811210708.14512-4-mario.limonciello@xxxxxxx>
From: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx>
commit 170390e587a69b2a24abac39eb3ae6ec28a4d7f2 upstream
A seamless boot stream has hardware resources assigned to it, and adding
a new stream means rebuilding the current assignment. It is desirable to
avoid this situation since it may cause light-up issues on the VGA
monitor on USB-C. This commit swaps the seamless boot stream to pipe 0
(if necessary) to ensure that the pipe context matches.
Reviewed-by: Harry Wentland <harry.wentland@xxxxxxx>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx>
Co-developed-by: Aurabindo Pillai <aurabindo.pillai@xxxxxxx>
Signed-off-by: Aurabindo Pillai <aurabindo.pillai@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -2788,6 +2788,21 @@ enum dc_status dc_validate_with_context(
goto fail;
}
+ /* Swap seamless boot stream to pipe 0 (if needed) to ensure pipe_ctx
+ * matches. This may change in the future if seamless_boot_stream can be
+ * multiple.
+ */
+ for (i = 0; i < add_streams_count; i++) {
+ mark_seamless_boot_stream(dc, add_streams[i]);
+ if (add_streams[i]->apply_seamless_boot_optimization && i != 0) {
+ struct dc_stream_state *temp = add_streams[0];
+
+ add_streams[0] = add_streams[i];
+ add_streams[i] = temp;
+ break;
+ }
+ }
+
/* Add new streams and then add all planes for the new stream */
for (i = 0; i < add_streams_count; i++) {
calculate_phy_pix_clks(add_streams[i]);
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-6.1/drm-amd-display-fix-the-build-when-drm_amd_dc_dcn-is-not-set.patch
queue-6.1/drm-amd-pm-fulfill-powerplay-peak-profiling-mode-shader-memory-clock-settings.patch
queue-6.1/drm-amd-display-handle-virtual-hardware-detect.patch
queue-6.1/drm-amd-display-use-update-plane-and-stream-routine-for-dcn32x.patch
queue-6.1/drm-amd-display-avoid-abm-when-odm-combine-is-enabled-for-edp.patch
queue-6.1/drm-amd-pm-fulfill-swsmu-peak-profiling-mode-shader-memory-clock-settings.patch
queue-6.1/drm-amd-pm-avoid-unintentional-shutdown-due-to-temperature-momentary-fluctuation.patch
queue-6.1/drm-amd-display-update-otg-instance-in-the-commit-stream.patch
queue-6.1/drm-amd-pm-expose-swctf-threshold-setting-for-legacy-powerplay.patch
queue-6.1/drm-amd-display-add-function-for-validate-and-update-new-stream.patch
queue-6.1/drm-amd-display-trigger-timing-sync-only-if-tg-is-running.patch
queue-6.1/drm-amd-display-handle-seamless-boot-stream.patch
queue-6.1/drm-amd-display-retain-phantom-plane-stream-if-validation-fails.patch
queue-6.1/drm-amd-display-disable-phantom-otg-after-enable-for-plane-disable.patch
