blob: 7ad80906f07ce3b02090f9bcb898cc03439b7965 (
plain)
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
53
54
55
56
57
|
From 0b27b3a993efc981fc9cfe3f22ec9113a59ea0a4 Mon Sep 17 00:00:00 2001
From: "Jerry (Fangzhi) Zuo" <Jerry.Zuo@amd.com>
Date: Wed, 3 Jan 2018 13:56:13 -0500
Subject: [PATCH 1095/4131] drm/amd/display: Fixed MST wrong link settings for
edp
Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 10 +++-------
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 8 ++++++++
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 232249a..d6cc3b3 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -679,13 +679,9 @@ bool dc_link_detect(struct dc_link *link, bool boot)
* TODO debug why Dell 2413 doesn't like
* two link trainings
*/
- if (is_mst_supported(link)) {
- link->verified_link_cap =
- link->reported_link_cap;
- } else {
- dp_hbr_verify_link_cap(link,
- &link->reported_link_cap);
- }
+
+ /* deal with non-mst cases */
+ dp_hbr_verify_link_cap(link, &link->reported_link_cap);
}
/* HDMI-DVI Dongle */
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index 9d5fe65..77dce1f 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -1460,6 +1460,14 @@ void decide_link_settings(struct dc_stream_state *stream,
return;
}
+ /* MST doesn't perform link training for now
+ * TODO: add MST specific link training routine
+ */
+ if (is_mst_supported(link)) {
+ *link_setting = link->verified_link_cap;
+ return;
+ }
+
/* search for the minimum link setting that:
* 1. is supported according to the link training result
* 2. could support the b/w requested by the timing
--
2.7.4
|
