This is a note to let you know that I've just added the patch titled drm/amd/display: Use update plane and stream routine for DCN32x 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-use-update-plane-and-stream-routine-for-dcn32x.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:04 -0500 Subject: drm/amd/display: Use update plane and stream routine for DCN32x To: <stable@xxxxxxxxxxxxxxx> Cc: <Tianci.Yin@xxxxxxx>, <Richard.Gong@xxxxxxx>, <Aurabindo.Pillai@xxxxxxx>, Mario Limonciello <mario.limonciello@xxxxxxx> Message-ID: <20230811210708.14512-7-mario.limonciello@xxxxxxx> From: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx> commit dddde627807c22d6f15f4417eb395b13a1ca88f9 upstream Sub-viewport (Subvp) feature is used for changing MCLK without causing any display artifact, requiring special treatment from the plane and stream perspective since DC needs to read data from the cache when using subvp. However, the function dc_commit_updates_for_stream does not provide all the support needed by this feature which will make this function legacy at some point. For this reason, this commit enables dc_update_planes_and_stream for ASICs that support this feature but preserves the old behavior for other ASICs. However, dc_update_planes_and_stream should replace dc_commit_updates_for_stream for all ASICs since it does most of the tasks executed by dc_commit_updates_for_stream with other extra operations, but we need to run tests before making this change. 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.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -4002,6 +4002,18 @@ void dc_commit_updates_for_stream(struct struct dc_context *dc_ctx = dc->ctx; int i, j; + /* TODO: Since change commit sequence can have a huge impact, + * we decided to only enable it for DCN3x. However, as soon as + * we get more confident about this change we'll need to enable + * the new sequence for all ASICs. + */ + if (dc->ctx->dce_version >= DCN_VERSION_3_2) { + dc_update_planes_and_stream(dc, srf_updates, + surface_count, stream, + stream_update); + return; + } + stream_status = dc_stream_get_status(stream); context = dc->current_state; 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