1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
From 3e8c3e5e18253a44dcfe1b95fc1dd15c5fe35868 Mon Sep 17 00:00:00 2001
From: Joshua Aberback <Joshua.Aberback@amd.com>
Date: Mon, 9 Jan 2017 14:43:08 -0500
Subject: [PATCH 0133/4131] drm/amd/display: When signal type of sink is none,
use link type for stream
Signed-off-by: Joshua Aberback <Joshua.Aberback@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index a82f2d6..59770bc 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -984,19 +984,20 @@ static void update_stream_signal(struct core_stream *stream)
{
const struct dc_sink *dc_sink = stream->public.sink;
- stream->signal = dc_sink->sink_signal;
- /* 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 (dc_sink->sink_signal == SIGNAL_TYPE_DVI_SINGLE_LINK ||
- dc_sink->sink_signal == SIGNAL_TYPE_DVI_DUAL_LINK) {
- if (stream->public.timing.pix_clk_khz >
- TMDS_MAX_PIXEL_CLOCK_IN_KHZ)
+ 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;
else
stream->signal = SIGNAL_TYPE_DVI_SINGLE_LINK;
- }
+ else
+ stream->signal = dc_sink->sink_signal;
}
bool resource_is_stream_unchanged(
--
2.7.4
|
