drm/amd/display: Add w/a to disable DP dual mode on certain ports

[Why]
Certain ports on DCN3.2 configs do not properly populate the BIOS
info table flag to indicate DP dual mode is unsupported.

[How]
Add a workaround to disable DP dual mode on the ports with the missing
BIOS info table flag.

Reviewed-by: Michael Strauss <Michael.Strauss@amd.com>
Acked-by: Alan Liu <HaoPing.Liu@amd.com>
Signed-off-by: George Shen <george.shen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index fea68383bb61f6543673a8612c79cdcf2ff219b3..fe60816653d0bb2579a11682686d4148d7d941d0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -887,6 +887,7 @@ struct dc_debug_options {
        bool override_odm_optimization;
        bool minimize_dispclk_using_odm;
        bool disable_subvp_high_refresh;
+       bool disable_dp_plus_plus_wa;
 };
 
 struct gpu_info_soc_bounding_box_v1_0;

diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
index a4932388587453a8f834cad6454641c02fb1ca02..4de2f8813dce34929016332cadaedf44d3c2d932 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
@@ -729,6 +729,7 @@ static const struct dc_debug_options debug_defaults_drv = {
        .disable_fpo_vactive = false,
        .disable_boot_optimizations = false,
        .disable_subvp_high_refresh = true,
+       .disable_dp_plus_plus_wa = true,
 };
 
 static const struct dc_debug_options debug_defaults_diags = {

diff --git a/drivers/gpu/drm/amd/display/dc/link/link_detection.c b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
index a131e30fd7d6a01036b55598662b50345dbc34e1..17904de4f155b37900487855b0cfdf7846a70c4b 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
@@ -593,6 +593,10 @@ static bool detect_dp(struct dc_link *link,
                        /* DP SST branch */
                        link->type = dc_connection_sst_branch;
        } else {
+               if (link->dc->debug.disable_dp_plus_plus_wa &&
+                               link->link_enc->features.flags.bits.IS_UHBR20_CAPABLE)
+                       return false;
+
                /* DP passive dongles */
                sink_caps->signal = dp_passive_dongle_detection(link->ddc,
                                                                sink_caps,