From: Sylvia Tsai <sylvia.tsai@amd.com>
Date: Tue, 4 Apr 2017 17:28:17 -0400
Subject: drm/amd/display: Adding dm controlled signal type in dc_stream
Git-commit: 8b32076c27227cf5bed0c925c7a1a9680748424a
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

- Adding dm controlled signal type in dc_stream
- Adding fallback to dvi signal when output signal is hdmi and the connector
  type is not

Signed-off-by: Sylvia Tsai <sylvia.tsai@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Sylvia Tsai <Sylvia.Tsai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c |   28 +++++++++++-----------
 drivers/gpu/drm/amd/display/dc/dc.h               |    1 
 2 files changed, 15 insertions(+), 14 deletions(-)

--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1237,22 +1237,22 @@ static struct audio *find_first_free_aud
 
 static void update_stream_signal(struct core_stream *stream)
 {
-	const struct dc_sink *dc_sink = stream->public.sink;
+	if (stream->public.output_signal == SIGNAL_TYPE_NONE) {
+		const struct dc_sink *dc_sink = stream->public.sink;
 
-	if (dc_sink->sink_signal == SIGNAL_TYPE_NONE)
-		stream->signal = stream->sink->link->public.connector_signal;
-	else if (dc_sink->sink_signal == SIGNAL_TYPE_DVI_SINGLE_LINK ||
-			dc_sink->sink_signal == SIGNAL_TYPE_DVI_DUAL_LINK)
-		/* For asic supports dual link DVI, we should adjust signal type
-		 * based on timing pixel clock. If pixel clock more than 165Mhz,
-		 * signal is dual link, otherwise, single link.
-		 */
-		if (stream->public.timing.pix_clk_khz > TMDS_MAX_PIXEL_CLOCK_IN_KHZ)
-			stream->signal = SIGNAL_TYPE_DVI_DUAL_LINK;
+		if (dc_sink->sink_signal == SIGNAL_TYPE_NONE)
+			stream->signal =
+					stream->sink->link->
+					public.connector_signal;
 		else
-			stream->signal = SIGNAL_TYPE_DVI_SINGLE_LINK;
-	else
-		stream->signal = dc_sink->sink_signal;
+			stream->signal = dc_sink->sink_signal;
+	} else {
+		stream->signal = stream->public.output_signal;
+	}
+
+	if (stream->signal == SIGNAL_TYPE_DVI_SINGLE_LINK &&
+		stream->public.timing.pix_clk_khz > TMDS_MAX_PIXEL_CLOCK_IN_KHZ)
+		stream->signal = SIGNAL_TYPE_DVI_DUAL_LINK;
 }
 
 bool resource_is_stream_unchanged(
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -411,6 +411,7 @@ enum surface_update_type {
 struct dc_stream {
 	const struct dc_sink *sink;
 	struct dc_crtc_timing timing;
+	enum signal_type output_signal;
 
 	enum dc_color_space output_color_space;