From 6b7e9764c7572b50ce2d5063e81bc5a0a83b7f76 Mon Sep 17 00:00:00 2001
From: Solomon Chiu <Solomon.Chiu@amd.com>
Date: Tue, 5 Oct 2021 09:43:52 -0400
Subject: [PATCH] Revert "drm/amd/display: Skip override for preferred link
settings during link training"
This reverts commit 6356d161596c11deb3fb01830fc2e46dbffb5303.
Reason for revert: It causes build break.
Change-Id: If75a27508bdd65226a6a2828daa88034475b5364
---
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 758255eabaa43..5eb40dcff3158 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -1643,6 +1643,12 @@ static void override_training_settings(
{
uint32_t lane;
+ /* Override link settings */
+ if (link->preferred_link_setting.link_rate != LINK_RATE_UNKNOWN)
+ lt_settings->link_settings.link_rate = link->preferred_link_setting.link_rate;
+ if (link->preferred_link_setting.lane_count != LANE_COUNT_UNKNOWN)
+ lt_settings->link_settings.lane_count = link->preferred_link_setting.lane_count;
+
/* Override link spread */
if (!link->dp_ss_off && overrides->downspread != NULL)
lt_settings->link_settings.link_spread = *overrides->downspread ?
--
GitLab