drm/amdgpu/display: fix logic regression in dce110 apply_single_controller_ctx_to_hw
Subsystems (3)
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu/display: fix logic regression in dce110 apply_single_controller_ctx_to_hw
Commit 5de27e1d6755 ("drm/amd/display: Add DP 2.0 SST DC Support") added a new check for DP 2.0 with a CONFIG_DRM_AMD_DC_DCN check that removed a bunch of logic if CONFIG_DRM_AMD_DC_DCN was not set, restore that logic.
--- .../gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +1 -6
@@ -1545,6 +1545,7 @@ static enum dc_status apply_single_controller_ctx_to_hw(* function core_link_enable_stream */ if (!(hws->wa.dp_hpo_and_otg_sequence && is_dp_128b_132b_signal(pipe_ctx))) +#endif /* */ /* Do not touch stream timing on seamless boot optimization. */ if (!pipe_ctx->stream->apply_seamless_boot_optimization)
@@ -1558,12 +1559,6 @@ static enum dc_status apply_single_controller_ctx_to_hw(if (pipe_ctx->stream_res.tg->funcs->set_drr) pipe_ctx->stream_res.tg->funcs->set_drr ( pipe_ctx->stream_res.tg, ¶ms); -#else -/* */ -/* Do not touch stream timing on seamless boot optimization. */ -if (!pipe_ctx->stream->apply_seamless_boot_optimization) - hws->funcs.enable_stream_timing (pipe_ctx, context, dc); -#endif // DRR should set trigger event to monitor surface update event if (stream->adjust.v_total_min !=0 && stream->adjust.v_total_max !=0 )
Signature · 1 line
2.31.1
[AMD Official Use Only]
Thanks for pointing out the mistake.
-----Original Message-----
From: Deucher, Alexander <[email protected]>
Sent: August 25, 2021 1:07 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zuo, Jerry <[email protected]>
Subject: [PATCH] drm/amdgpu/display: fix logic regression in dce110 apply_single_controller_ctx_to_hw
Commit 5de27e1d6755 ("drm/amd/display: Add DP 2.0 SST DC Support") added a new check for DP 2.0 with a CONFIG_DRM_AMD_DC_DCN check that removed a bunch of logic if CONFIG_DRM_AMD_DC_DCN was not set, restore that logic.
--- .../gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +1 -6
@@ -1545,6 +1545,7 @@ static enum dc_status apply_single_controller_ctx_to_hw(* function core_link_enable_stream */ if (!(hws->wa.dp_hpo_and_otg_sequence && is_dp_128b_132b_signal(pipe_ctx))) +#endif /* */ /* Do not touch stream timing on seamless boot optimization. */ if (!pipe_ctx->stream->apply_seamless_boot_optimization)
@@ -1558,12 +1559,6 @@ static enum dc_status apply_single_controller_ctx_to_hw(if (pipe_ctx->stream_res.tg->funcs->set_drr) pipe_ctx->stream_res.tg->funcs->set_drr ( pipe_ctx->stream_res.tg, ¶ms); -#else -/* */ -/* Do not touch stream timing on seamless boot optimization. */ -if (!pipe_ctx->stream->apply_seamless_boot_optimization) - hws->funcs.enable_stream_timing (pipe_ctx, context, dc); -#endif // DRR should set trigger event to monitor surface update event if (stream->adjust.v_total_min !=0 && stream->adjust.v_total_max !=0 )
--
2.31.1