aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/1496-drm-amd-dal-skip-MST-fake-connectors-on-resume.patch
blob: 697874267bd039856a7a3731992fc9ab893a7a05 (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
From 5280d17b638880088c594bc22bbb2f82cac3a916 Mon Sep 17 00:00:00 2001
From: Mykola Lysenko <Mykola.Lysenko@amd.com>
Date: Tue, 8 Mar 2016 05:17:06 -0500
Subject: [PATCH 1496/1565] drm/amd/dal: skip MST fake connectors on resume

This change is needed in order to avoid multiple dc_link_detect
calls on one DP link.

Also it disables removal of sink from connector hence allow
to restore mode on resume.

However this is only partial fix. Additional change will be
provided in order to fix topology change

Change-Id: Ida6d4806d41639394cf80980acef2aa8d444419c
Signed-off-by: Mykola Lysenko <Mykola.Lysenko@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
---
 drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
index a9973ed..5bef63c 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
@@ -587,6 +587,14 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev )
 	list_for_each_entry(connector,
 			&ddev->mode_config.connector_list, head) {
 		aconnector = to_amdgpu_connector(connector);
+
+		/*
+		 * this is the case when traversing through already created
+		 * MST connectors, should be skipped
+		 */
+		if (aconnector->mst_port)
+			continue;
+
 		dc_link_detect(aconnector->dc_link, false);
 		aconnector->dc_sink = NULL;
 		amdgpu_dm_update_connector_after_detect(aconnector);
-- 
1.9.1