summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/display/dc/dce
diff options
context:
space:
mode:
authorCharlene Liu <charlene.liu@amd.com>2017-08-23 03:15:28 +0300
committerAlex Deucher <alexander.deucher@amd.com>2017-09-27 01:17:05 +0300
commit577b5c2b51014b3c276ab1d456aaad965dbb4930 (patch)
tree3c61b477accc08cfae5dbc733b566ee93647fa86 /drivers/gpu/drm/amd/display/dc/dce
parent0f0bdca5cae04ec2f842955bcef16a3daed6149f (diff)
downloadlinux-577b5c2b51014b3c276ab1d456aaad965dbb4930.tar.xz
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>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c4
1 files changed, 4 insertions, 0 deletions
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 559a9f81c9c9..0ce94ede80bf 100644
--- 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;