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
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
From 2708dd4f43bf9542e55188db188403ef1d71e1a2 Mon Sep 17 00:00:00 2001
From: Mykola Lysenko <Mykola.Lysenko@amd.com>
Date: Thu, 10 Mar 2016 05:22:27 -0500
Subject: [PATCH 0901/1110] drm/amd/dal: on resume do not set mode on
disconnected sink
In case display got disconnected during sleep (s3), it should not
be restored during resume, as for DP it will try to link train
which will fail and generate backtrace with warning
Signed-off-by: Mykola Lysenko <Mykola.Lysenko@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c | 77 +++++++++++++++++++---
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.h | 5 ++
.../gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c | 19 ++----
3 files changed, 79 insertions(+), 22 deletions(-)
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 20654b9..6cea7e2 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
@@ -440,6 +440,33 @@ static int dm_suspend(void *handle)
return ret;
}
+struct amdgpu_connector *amdgpu_dm_find_first_crct_matching_connector(
+ struct drm_atomic_state *state,
+ struct drm_crtc *crtc,
+ bool from_state_var)
+{
+ uint32_t i;
+ struct drm_connector_state *conn_state;
+ struct drm_connector *connector;
+ struct drm_crtc *crtc_from_state;
+
+ for_each_connector_in_state(
+ state,
+ connector,
+ conn_state,
+ i) {
+ crtc_from_state =
+ from_state_var ?
+ conn_state->crtc :
+ connector->state->crtc;
+
+ if (crtc_from_state == crtc)
+ return to_amdgpu_connector(connector);
+ }
+
+ return NULL;
+}
+
static int dm_display_resume(struct drm_device *ddev)
{
int ret = 0;
@@ -448,13 +475,38 @@ static int dm_display_resume(struct drm_device *ddev)
struct drm_atomic_state *state = drm_atomic_state_alloc(ddev);
struct drm_plane *plane;
struct drm_crtc *crtc;
+ struct amdgpu_connector *aconnector;
+ struct drm_connector_state *conn_state;
if (!state)
return ENOMEM;
state->acquire_ctx = ddev->mode_config.acquire_ctx;
- /* Construct an atomic state to restore previous display setting*/
+ /* Construct an atomic state to restore previous display setting */
+
+ /*
+ * Attach connectors to drm_atomic_state
+ * Should be done in the first place in order to make connectors
+ * available in state during crtc state processing. It is used for
+ * making decision if crtc should be disabled in case sink got
+ * disconnected.
+ *
+ * Connectors state crtc with NULL dc_sink should be cleared, because it
+ * will fail validation during commit
+ */
+ list_for_each_entry(connector, &ddev->mode_config.connector_list, head) {
+ aconnector = to_amdgpu_connector(connector);
+ conn_state = drm_atomic_get_connector_state(state, connector);
+
+ ret = PTR_ERR_OR_ZERO(conn_state);
+ if (ret)
+ goto err;
+
+ if (!aconnector->dc_sink)
+ conn_state->crtc = NULL;
+ }
+
/* Attach crtcs to drm_atomic_state*/
list_for_each_entry(crtc, &ddev->mode_config.crtc_list, head) {
struct drm_crtc_state *crtc_state =
@@ -464,24 +516,31 @@ static int dm_display_resume(struct drm_device *ddev)
if (ret)
goto err;
+ aconnector =
+ amdgpu_dm_find_first_crct_matching_connector(
+ state,
+ crtc,
+ true);
+
+ /*
+ * this is the case when display disappear during sleep
+ */
+ if (!aconnector) {
+ crtc_state->active = false;
+ crtc_state->enable = false;
+ }
+
/* force a restore */
crtc_state->mode_changed = true;
}
- /* Attach planes to drm_atomic_state*/
+ /* Attach planes to drm_atomic_state */
list_for_each_entry(plane, &ddev->mode_config.plane_list, head) {
ret = PTR_ERR_OR_ZERO(drm_atomic_get_plane_state(state, plane));
if (ret)
goto err;
}
- /* Attach connectors to drm_atomic_state*/
- list_for_each_entry(connector, &ddev->mode_config.connector_list, head) {
- ret = PTR_ERR_OR_ZERO(drm_atomic_get_connector_state(state, connector));
- if (ret)
- goto err;
- }
-
/* Call commit internally with the state we just constructed */
ret = drm_atomic_commit(state);
if (!ret)
diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.h
index 94c20d5..5674a82 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.h
@@ -165,4 +165,9 @@ extern const struct amd_ip_funcs amdgpu_dm_funcs;
void amdgpu_dm_update_connector_after_detect(
struct amdgpu_connector *aconnector);
+struct amdgpu_connector *amdgpu_dm_find_first_crct_matching_connector(
+ struct drm_atomic_state *state,
+ struct drm_crtc *crtc,
+ bool from_state_var);
+
#endif /* __AMDGPU_DM_H__ */
diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c
index 572c5bd..474439f 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c
@@ -2115,7 +2115,7 @@ int amdgpu_dm_atomic_commit(
struct amdgpu_display_manager *dm = &adev->dm;
struct drm_plane *plane;
struct drm_plane_state *old_plane_state;
- uint32_t i, j;
+ uint32_t i;
int32_t ret;
uint32_t commit_targets_count = 0;
uint32_t new_crtcs_count = 0;
@@ -2157,21 +2157,14 @@ int amdgpu_dm_atomic_commit(
struct amdgpu_connector *aconnector = NULL;
enum dm_commit_action action;
struct drm_crtc_state *new_state = crtc->state;
- struct drm_connector *connector;
- struct drm_connector_state *old_con_state;
acrtc = to_amdgpu_crtc(crtc);
- for_each_connector_in_state(
- state,
- connector,
- old_con_state,
- j) {
- if (connector->state->crtc == crtc) {
- aconnector = to_amdgpu_connector(connector);
- break;
- }
- }
+ aconnector =
+ amdgpu_dm_find_first_crct_matching_connector(
+ state,
+ crtc,
+ false);
/* handles headless hotplug case, updating new_state and
* aconnector as needed
--
2.7.4
|
