blob: 70814c334c430c5a850edd85a1119dfe862fb19c (
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
|
From 5a94b3a597f16ef5006ec5eff8551be3586ccdcc Mon Sep 17 00:00:00 2001
From: Mykola Lysenko <Mykola.Lysenko@amd.com>
Date: Mon, 14 Dec 2015 19:22:38 +0800
Subject: [PATCH 0953/1050] drm/amd/dal: guard drm mst manager usage
In case mst branch got disconnected, and mst manager
is not active, we should not call its functions.
Change-Id: Ie3161a4635ea4495770c982cca774c8fe0aeb69f
Signed-off-by: Mykola Lysenko <Mykola.Lysenko@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Harry Wentland<harry.wentland@amd.com>
---
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c
index 0230ee9..ddc40c9 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dc_helpers.c
@@ -192,6 +192,10 @@ bool dc_helpers_dp_mst_write_payload_allocation_table(
return false;
mst_mgr = &aconnector->mst_port->mst_mgr;
+
+ if (!mst_mgr->mst_state)
+ return false;
+
mst_port = aconnector->port;
if (enable) {
@@ -379,6 +383,9 @@ bool dc_helpers_dp_mst_poll_for_allocation_change_trigger(
mst_mgr = &aconnector->mst_port->mst_mgr;
+ if (!mst_mgr->mst_state)
+ return false;
+
ret = drm_dp_check_act_status(mst_mgr);
if (ret)
@@ -408,6 +415,9 @@ bool dc_helpers_dp_mst_send_payload_allocation(
mst_mgr = &aconnector->mst_port->mst_mgr;
+ if (!mst_mgr->mst_state)
+ return false;
+
ret = drm_dp_update_payload_part2(mst_mgr);
if (ret)
--
1.9.1
|
