From: Ilya Bakoulin <[email protected]> [Why/How] Sink requesting a new link rate is not handled properly on hotplug when FLT_NO_TIMEOUT is set. Check the existing config on the sink to see if a link rate update is needed.
Cc: Wenjing Liu <[email protected]> Signed-off-by: Ilya Bakoulin <[email protected]> Signed-off-by: Wayne Lin <[email protected]> --- drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 1 + .../display/dc/link/protocols/link_hdmi_frl.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h b/drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h index 9e0fe41f28a5..446db6dab312 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h +++ b/drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h @@ -276,6 +276,7 @@ struct dc_hdmi_frl_flags { bool force_frl_max; bool apply_vsdb_rcc_wa; bool no_timeout; + enum hdmi_frl_link_rate no_timeout_frl_link_rate; }; struct dc_hdmi_frl_link_training_overrides { diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_hdmi_frl.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_hdmi_frl.c index 097df185a618..c31be4900e8d 100644 --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_hdmi_frl.c +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_hdmi_frl.c @@ -461,7 +461,8 @@ static enum link_result hdmi_frl_perform_link_training(struct ddc_service *ddc_s sizeof(offset), &test_req.byte, sizeof(test_req.byte)); FRL_INFO("FRL TEST REQ: FLT_no_timeout = %d \n", test_req.fields.FLT_NO_TIMEOUT); - if (test_req.fields.FLT_NO_TIMEOUT && ddc_service->link->frl_flags.no_timeout) { + if (test_req.fields.FLT_NO_TIMEOUT && ddc_service->link->frl_flags.no_timeout && + ddc_service->link->frl_flags.no_timeout_frl_link_rate == link_settings->frl_link_rate) { bool de_emphasis_only = false; bool pre_shoot_only = false; bool no_ffe = false; @@ -538,6 +539,7 @@ static enum link_result hdmi_frl_perform_link_training(struct ddc_service *ddc_s if (test_req.fields.FLT_NO_TIMEOUT) { ddc_service->link->frl_flags.no_timeout = true; + ddc_service->link->frl_flags.no_timeout_frl_link_rate = link_settings->frl_link_rate; /*Specify FRL rate*/ write_buffer[0] = HDMI_SCDC_CONFIG_1; @@ -834,6 +836,15 @@ enum link_result hdmi_frl_perform_link_training_with_fallback( msleep(200); + /* If we're in a NO_TIMEOUT state and link rate changes, cycle the link on/off + * so that the new link rate is properly applied */ + if (link->frl_flags.no_timeout) { + if (link->frl_flags.no_timeout_frl_link_rate != link->frl_link_settings.frl_link_rate) { + link->hpo_frl_link_enc->funcs->disable_link_encoder(link->hpo_frl_link_enc); + link->link_enc->funcs->disable_output(link->link_enc, SIGNAL_TYPE_HDMI_FRL); + } + } + link->ctx->dc->hwss.setup_hdmi_frl_link(link, 0, frl_phy_clock_source_id); @@ -1023,7 +1034,7 @@ void hdmi_frl_set_preferred_link_settings(struct dc *dc, link_stream->link->frl_link_settings = *link_setting; link_stream->link->frl_verified_link_cap = *link_setting; - while (link_stat != LINK_RESULT_SUCCESS) { + while (link_stat != LINK_RESULT_SUCCESS && link_stat != LINK_RESULT_NO_TIMEOUT) { link_set_dpms_off(pipe); /* For DCN3.0, can also have 4:1 combine mode. * TODO: Add function get_odm_combine_mode that has different @@ -1101,7 +1112,7 @@ void hdmi_frl_set_preferred_link_settings(struct dc *dc, link_stat = hdmi_frl_perform_link_training_with_retries(link_stream->link); /* Enable FRL packet transmission */ - if (link_stat == LINK_RESULT_SUCCESS) { + if (link_stat == LINK_RESULT_SUCCESS || link_stat == LINK_RESULT_NO_TIMEOUT) { link_stream->link->hpo_frl_link_enc->funcs->enable_output( link_stream->link->hpo_frl_link_enc); if (link_stream->link->frl_flags.apply_vsdb_rcc_wa) -- 2.43.0
