This is a note to let you know that I've just added the patch titled
drm/amd/display: limit the v_startup workaround to ASICs older than DCN3.1
to the 6.5-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-limit-the-v_startup-workaround-to-asics-older-than-dcn3.1.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 47428f4b638d3b3264a2efa1a567b0bbddbb6107 Mon Sep 17 00:00:00 2001
From: Hamza Mahfooz <hamza.mahfooz@xxxxxxx>
Date: Thu, 31 Aug 2023 15:22:35 -0400
Subject: drm/amd/display: limit the v_startup workaround to ASICs older than DCN3.1
From: Hamza Mahfooz <hamza.mahfooz@xxxxxxx>
commit 47428f4b638d3b3264a2efa1a567b0bbddbb6107 upstream.
Since, calling dcn20_adjust_freesync_v_startup() on DCN3.1+ ASICs
can cause the display to flicker and underflow to occur, we shouldn't
call it for them. So, ensure that the DCN version is less than
DCN_VERSION_3_1 before calling dcn20_adjust_freesync_v_startup().
Cc: stable@xxxxxxxxxxxxxxx
Reviewed-by: Fangzhi Zuo <jerry.zuo@xxxxxxx>
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c
@@ -1099,7 +1099,8 @@ void dcn20_calculate_dlg_params(struct d
context->res_ctx.pipe_ctx[i].plane_res.bw.dppclk_khz =
pipes[pipe_idx].clks_cfg.dppclk_mhz * 1000;
context->res_ctx.pipe_ctx[i].pipe_dlg_param = pipes[pipe_idx].pipe.dest;
- if (context->res_ctx.pipe_ctx[i].stream->adaptive_sync_infopacket.valid)
+ if (dc->ctx->dce_version < DCN_VERSION_3_1 &&
+ context->res_ctx.pipe_ctx[i].stream->adaptive_sync_infopacket.valid)
dcn20_adjust_freesync_v_startup(
&context->res_ctx.pipe_ctx[i].stream->timing,
&context->res_ctx.pipe_ctx[i].pipe_dlg_param.vstartup_start);
Patches currently in stable-queue which might be from hamza.mahfooz@xxxxxxx are
queue-6.5/drm-amd-display-fix-mode-scaling-rmx_.patch
queue-6.5/drm-amd-display-update-blank-state-on-odm-changes.patch
queue-6.5/drm-amd-display-always-switch-off-odm-before-committing-more-streams.patch
queue-6.5/drm-amd-display-remove-wait-while-locked.patch
queue-6.5/drm-amd-display-prevent-potential-division-by-zero-errors.patch
queue-6.5/drm-amdgpu-register-a-dirty-framebuffer-callback-for-fbcon.patch
queue-6.5/drm-amd-display-limit-the-v_startup-workaround-to-asics-older-than-dcn3.1.patch
queue-6.5/revert-drm-amd-display-remove-v_startup-workaround-for-dcn3.patch
