[PATCH 06/27] drm/amd/display: Skip checking FRL_MODE bit for PCON BW determination

[Wayne Lin]

From: George Shen <george.s...@amd.com>

[Why/How]
Certain PCON will clear the FRL_MODE bit despite supporting the link BW
indicated in the other bits.

Thus, skip checking the FRL_MODE bit when interpreting the
hdmi_encoded_link_bw struct.

Reviewed-by: Wenjing Liu <wenjing....@amd.com>
Signed-off-by: George Shen <george.s...@amd.com>
Signed-off-by: Wayne Lin <wayne....@amd.com>
---
 .../dc/link/protocols/link_dp_capability.c    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c 
b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c
index da19f6a3b42b..a77410122636 100644
--- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c
+++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c
@@ -250,21 +250,21 @@ static uint32_t intersect_frl_link_bw_support(
 {
        uint32_t supported_bw_in_kbps = max_supported_frl_bw_in_kbps;
 
-       // HDMI_ENCODED_LINK_BW bits are only valid if HDMI Link Configuration 
bit is 1 (FRL mode)
-       if (hdmi_encoded_link_bw.bits.FRL_MODE) {
-               if (hdmi_encoded_link_bw.bits.BW_48Gbps)
-                       supported_bw_in_kbps = 48000000;
-               else if (hdmi_encoded_link_bw.bits.BW_40Gbps)
-                       supported_bw_in_kbps = 40000000;
-               else if (hdmi_encoded_link_bw.bits.BW_32Gbps)
-                       supported_bw_in_kbps = 32000000;
-               else if (hdmi_encoded_link_bw.bits.BW_24Gbps)
-                       supported_bw_in_kbps = 24000000;
-               else if (hdmi_encoded_link_bw.bits.BW_18Gbps)
-                       supported_bw_in_kbps = 18000000;
-               else if (hdmi_encoded_link_bw.bits.BW_9Gbps)
-                       supported_bw_in_kbps = 9000000;
-       }
+       /* Skip checking FRL_MODE bit, as certain PCON will clear
+        * it despite supporting the link BW indicated in the other bits.
+        */
+       if (hdmi_encoded_link_bw.bits.BW_48Gbps)
+               supported_bw_in_kbps = 48000000;
+       else if (hdmi_encoded_link_bw.bits.BW_40Gbps)
+               supported_bw_in_kbps = 40000000;
+       else if (hdmi_encoded_link_bw.bits.BW_32Gbps)
+               supported_bw_in_kbps = 32000000;
+       else if (hdmi_encoded_link_bw.bits.BW_24Gbps)
+               supported_bw_in_kbps = 24000000;
+       else if (hdmi_encoded_link_bw.bits.BW_18Gbps)
+               supported_bw_in_kbps = 18000000;
+       else if (hdmi_encoded_link_bw.bits.BW_9Gbps)
+               supported_bw_in_kbps = 9000000;
 
        return supported_bw_in_kbps;
 }
-- 
2.37.3