Skip to content

Commit 2387033

Browse files
George Shenalexdeucher
authored andcommitted
drm/amd/display: Skip override for preferred link settings during link training
[Why] Overriding link setting inside override_training_settings result in fallback link settings being ignored. This can potentially cause link training to always fail and consequently result in an infinite loop of link training to occur in dp_verify_link_cap during detection. [How] Since preferred link settings are already considered inside decide_link_settings, skip the check in override_training_settings to avoid infinite link training loops. Reviewed-by: Wenjing Liu <[email protected]> Acked-by: Solomon Chiu <[email protected]> Signed-off-by: George Shen <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 248b061 commit 2387033

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,12 +1306,6 @@ static void override_training_settings(
13061306
{
13071307
uint32_t lane;
13081308

1309-
/* Override link settings */
1310-
if (link->preferred_link_setting.link_rate != LINK_RATE_UNKNOWN)
1311-
lt_settings->link_settings.link_rate = link->preferred_link_setting.link_rate;
1312-
if (link->preferred_link_setting.lane_count != LANE_COUNT_UNKNOWN)
1313-
lt_settings->link_settings.lane_count = link->preferred_link_setting.lane_count;
1314-
13151309
/* Override link spread */
13161310
if (!link->dp_ss_off && overrides->downspread != NULL)
13171311
lt_settings->link_settings.link_spread = *overrides->downspread ?

0 commit comments

Comments
 (0)