From: Charlene Liu <charlene.liu@amd.com>
Date: Mon, 17 Jul 2017 21:46:49 +0000 (-0400)
Subject: drm/amd/display: fix DVI connected to HDMI connector max tmds clock
X-Git-Tag: v4.15-rc1~56^2~23^2~315
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=83572340097012c91de3f96e52797491c79cfe43;p=linux.git

drm/amd/display: fix DVI connected to HDMI connector max tmds clock

Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@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/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
index 812c29982a2e..5663d3dbd7d5 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
@@ -830,6 +830,12 @@ bool dce110_link_encoder_validate_dvi_output(
 	if (crtc_timing->pixel_encoding != PIXEL_ENCODING_RGB)
 		return false;
 
+	/*connect DVI via adpater's HDMI connector*/
+	if ((connector_signal == SIGNAL_TYPE_DVI_SINGLE_LINK ||
+		connector_signal == SIGNAL_TYPE_HDMI_TYPE_A) &&
+		signal != SIGNAL_TYPE_HDMI_TYPE_A &&
+		crtc_timing->pix_clk_khz > TMDS_MAX_PIXEL_CLOCK)
+		return false;
 	if (crtc_timing->pix_clk_khz < TMDS_MIN_PIXEL_CLOCK)
 		return false;