drm/amd/display: Block 6Ghz timing if SBIOS set HDMI_6G_en to 0

Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
index 2c683d468bb8b2c1008d430c4543313a810b7c81..2c411441771b99194a689a8ee0f2572b7e83c9d3 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
@@ -1853,6 +1853,7 @@ static enum bp_result bios_parser_get_encoder_cap_info(
 
        info->DP_HBR2_EN = record->usHBR2En;
        info->DP_HBR3_EN = record->usHBR3En;
+       info->HDMI_6GB_EN = record->usHDMI6GEn;
        return BP_RESULT_OK;
 }
 

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
index 559a9f81c9c9ca150e0a219a1b42265d6c6a52f6..0ce94ede80bf8932505d41dfa97d5e71c5d7edf5 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
@@ -887,6 +887,9 @@ static bool dce110_link_encoder_validate_hdmi_output(
                        crtc_timing->pixel_encoding == PIXEL_ENCODING_YCBCR420)
                return false;
 
+       if (!enc110->base.features.flags.bits.HDMI_6GB_EN &&
+               adjusted_pix_clk_khz >= 300000)
+               return false;
        return true;
 }
 
@@ -1008,6 +1011,7 @@ bool dce110_link_encoder_construct(
                                bp_cap_info.DP_HBR2_EN;
                enc110->base.features.flags.bits.IS_HBR3_CAPABLE =
                                bp_cap_info.DP_HBR3_EN;
+               enc110->base.features.flags.bits.HDMI_6GB_EN = bp_cap_info.HDMI_6GB_EN;
        }
 
        return true;

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
index 38e4070806cb0fa26fdf6b1e46f2867eb5a329e3..961bbcc9202c5e865cdb913c2fc952f8dd58e095 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h
@@ -37,6 +37,7 @@ struct encoder_feature_support {
                        uint32_t IS_TPS3_CAPABLE:1;
                        uint32_t IS_TPS4_CAPABLE:1;
                        uint32_t IS_YCBCR_CAPABLE:1;
+                       uint32_t HDMI_6GB_EN:1;
                } bits;
                uint32_t raw;
        } flags;