Revert "drm/amd/display: Remove v_startup workaround for dcn3+"
Subsystems (5)
PATCH v2 1/2 Revert "drm/amd/display: Remove v_startup workaround for dcn3+"
This reverts commit 3a31e8b89b7240d9a17ace8a1ed050bdcb560f9e.
We still need to call dcn20_adjust_freesync_v_startup() for older DCN3+ ASICs otherwise it can cause DP to HDMI 2.1 PCONs to fail to light up.
--- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +4 -20
@@ -1099,6 +1099,10 @@ void dcn20_calculate_dlg_params(struct dc *dc, 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) +dcn20_adjust_freesync_v_startup ( + &context->res_ctx.pipe_ctx[i].stream->timing, + &context->res_ctx.pipe_ctx[i].pipe_dlg_param.vstartup_start); pipe_idx++; }
@@ -1927,7 +1931,6 @@ static bool dcn20_validate_bandwidth_internal(struct dc *dc, struct dc_state *coint vlevel =0 ;int pipe_split_from[MAX_PIPES ];int pipe_cnt =0 ; -int i =0 ;display_e2e_pipe_params_st *pipes =kzalloc (dc->res_pool->pipe_count *sizeof (display_e2e_pipe_params_st),GFP_ATOMIC );DC_LOGGER_INIT (dc->ctx->logger);
@@ -1951,15 +1954,6 @@ static bool dcn20_validate_bandwidth_internal(struct dc *dc, struct dc_state *codcn20_calculate_wm (dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel, fast_validate);dcn20_calculate_dlg_params (dc, context, pipes, pipe_cnt, vlevel); -for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (!context->res_ctx.pipe_ctx[i].stream) -continue ; -if (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); - } -BW_VAL_TRACE_END_WATERMARKS (); goto validate_out;
@@ -2232,7 +2226,6 @@ bool dcn21_validate_bandwidth_fp(struct dc *dc,int vlevel =0 ;int pipe_split_from[MAX_PIPES ];int pipe_cnt =0 ; -int i =0 ;display_e2e_pipe_params_st *pipes =kzalloc (dc->res_pool->pipe_count *sizeof (display_e2e_pipe_params_st),GFP_ATOMIC );DC_LOGGER_INIT (dc->ctx->logger);
@@ -2261,15 +2254,6 @@ bool dcn21_validate_bandwidth_fp(struct dc *dc,dcn21_calculate_wm (dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel, fast_validate);dcn20_calculate_dlg_params (dc, context, pipes, pipe_cnt, vlevel); -for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (!context->res_ctx.pipe_ctx[i].stream) -continue ; -if (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); - } -BW_VAL_TRACE_END_WATERMARKS (); goto validate_out;
Signature · 1 line
2.41.0
PATCH v2 2/2 drm/amd/display: limit the v_startup workaround for ASICs older than DCN3.1
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().
--- drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +2 -1
@@ -1099,7 +1099,8 @@ void dcn20_calculate_dlg_params(struct dc *dc, 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);
Signature · 1 line
2.41.0
[AMD Official Use Only - General]
Series is:
________________________________
发件人: Mahfooz, Hamza <[email protected]>
发送时间: 星期四, 八月 31, 2023 3:39:04 下午
收件人: [email protected] <[email protected]>
抄送: Zuo, Jerry <[email protected]>; Mahfooz, Hamza <[email protected]>; [email protected] <[email protected]>; Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Lei, Jun <[email protected]>; Pillai, Aurabindo <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Liu, Wenjing <[email protected]>; Lee, Alvin <[email protected]>; Kim, Sung joon <[email protected]>; Miess, Daniel <[email protected]>; Teeger, Gabe <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]> 主题: [PATCH v2 1/2] Revert "drm/amd/display: Remove v_startup workaround for dcn3+"
This reverts commit 3a31e8b89b7240d9a17ace8a1ed050bdcb560f9e.
We still need to call dcn20_adjust_freesync_v_startup() for older DCN3+ ASICs otherwise it can cause DP to HDMI 2.1 PCONs to fail to light up.
--- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +4 -20
@@ -1099,6 +1099,10 @@ void dcn20_calculate_dlg_params(struct dc *dc, 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) +dcn20_adjust_freesync_v_startup ( + &context->res_ctx.pipe_ctx[i].stream->timing, + &context->res_ctx.pipe_ctx[i].pipe_dlg_param.vstartup_start); pipe_idx++; }
@@ -1927,7 +1931,6 @@ static bool dcn20_validate_bandwidth_internal(struct dc *dc, struct dc_state *coint vlevel =0 ;int pipe_split_from[MAX_PIPES ];int pipe_cnt =0 ; -int i =0 ;display_e2e_pipe_params_st *pipes =kzalloc (dc->res_pool->pipe_count *sizeof (display_e2e_pipe_params_st),GFP_ATOMIC );DC_LOGGER_INIT (dc->ctx->logger);
@@ -1951,15 +1954,6 @@ static bool dcn20_validate_bandwidth_internal(struct dc *dc, struct dc_state *codcn20_calculate_wm (dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel, fast_validate);dcn20_calculate_dlg_params (dc, context, pipes, pipe_cnt, vlevel); -for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (!context->res_ctx.pipe_ctx[i].stream) -continue ; -if (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); - } -BW_VAL_TRACE_END_WATERMARKS (); goto validate_out;
@@ -2232,7 +2226,6 @@ bool dcn21_validate_bandwidth_fp(struct dc *dc,int vlevel =0 ;int pipe_split_from[MAX_PIPES ];int pipe_cnt =0 ; -int i =0 ;display_e2e_pipe_params_st *pipes =kzalloc (dc->res_pool->pipe_count *sizeof (display_e2e_pipe_params_st),GFP_ATOMIC );DC_LOGGER_INIT (dc->ctx->logger);
@@ -2261,15 +2254,6 @@ bool dcn21_validate_bandwidth_fp(struct dc *dc,dcn21_calculate_wm (dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel, fast_validate);dcn20_calculate_dlg_params (dc, context, pipes, pipe_cnt, vlevel); -for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (!context->res_ctx.pipe_ctx[i].stream) -continue ; -if (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); - } -BW_VAL_TRACE_END_WATERMARKS (); goto validate_out;
--
2.41.0
Quoted 7 lines · Jerry
[AMD Official Use Only - General]
Series is:
Reviewed-by Fangzhi Zuo <[email protected]>
Harry
Quoted 86 lines
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
*发件人:* Mahfooz, Hamza <[email protected]>
*发送时间:* 星期四, 八月 31, 2023 3:39:04 下午
*收件人:* [email protected] <[email protected]>
*抄送:* Zuo, Jerry <[email protected]>; Mahfooz, Hamza <[email protected]>; [email protected] <[email protected]>; Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Lei, Jun <[email protected]>; Pillai, Aurabindo <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Liu, Wenjing <[email protected]>; Lee, Alvin <[email protected]>; Kim, Sung joon <[email protected]>; Miess, Daniel <[email protected]>; Teeger, Gabe <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]> *主题:* [PATCH v2 1/2] Revert "drm/amd/display: Removev_startupworkaround for dcn3+"This reverts commit
3a31e8b89b7240d9a17ace8a1ed050bdcb560f9e.We still need to call
dcn20_adjust_freesync_v_startup()for older DCN3+ ASICs otherwise it can cause DP to HDMI 2.1 PCONs to fail to light up.Link https://gitlab.freedesktop.org/drm/amd/-/issues/2809 <https://gitlab.freedesktop.org/drm/amd/-/issues/2809>Signed-off-by Hamza Mahfooz <[email protected]>---
.../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 24 ++++---------------1 file changed, 4 insertions(+), 20 deletions(-)drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +0
-0@@ -1099,6 +1099,10 @@ void dcn20_calculate_dlg_params(struct dc *dc,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) + dcn20_adjust_freesync_v_startup(
+ &context->res_ctx.pipe_ctx[i].stream->timing, + &context->res_ctx.pipe_ctx[i].pipe_dlg_param.vstartup_start);
pipe_idx++;
}drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +0
-1@@ -1927,7 +1931,6 @@ static bool dcn20_validate_bandwidth_internal(struct dc *dc, struct dc_state *co int vlevel = 0; int pipe_split_from[MAX_PIPES]; int pipe_cnt = 0; - int i = 0; display_e2e_pipe_params_st *pipes = kzalloc(dc->res_pool->pipe_count * sizeof(display_e2e_pipe_params_st), GFP_ATOMIC); DC_LOGGER_INIT(dc->ctx->logger);drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +0
-0@@ -1951,15 +1954,6 @@ static bool dcn20_validate_bandwidth_internal(struct dc *dc, struct dc_state *co dcn20_calculate_wm(dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel, fast_validate); dcn20_calculate_dlg_params(dc, context, pipes, pipe_cnt, vlevel);
- for (i = 0; i <dc->res_pool->pipe_count; i++) {
- if (!context->res_ctx.pipe_ctx[i].stream)
- continue;
- if (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); - }
-
BW_VAL_TRACE_END_WATERMARKS();
gotovalidate_out;drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +0
-1@@ -2232,7 +2226,6 @@ bool dcn21_validate_bandwidth_fp(struct dc *dc, int vlevel = 0; int pipe_split_from[MAX_PIPES]; int pipe_cnt = 0; - int i = 0; display_e2e_pipe_params_st *pipes = kzalloc(dc->res_pool->pipe_count * sizeof(display_e2e_pipe_params_st), GFP_ATOMIC); DC_LOGGER_INIT(dc->ctx->logger);drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +0
-0@@ -2261,15 +2254,6 @@ bool dcn21_validate_bandwidth_fp(struct dc *dc, dcn21_calculate_wm(dc, context, pipes, &pipe_cnt, pipe_split_from, vlevel, fast_validate); dcn20_calculate_dlg_params(dc, context, pipes, pipe_cnt, vlevel);
- for (i = 0; i <dc->res_pool->pipe_count; i++) {
- if (!context->res_ctx.pipe_ctx[i].stream)
- continue;
- if (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); - }
-
BW_VAL_TRACE_END_WATERMARKS();
gotovalidate_out;Signature · 1 line
2.41.0