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
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
|
From 2489dfb057f2b659d56b2a6c4913dcf3123ee724 Mon Sep 17 00:00:00 2001
From: "Le.Ma" <Le.Ma@amd.com>
Date: Wed, 29 Nov 2017 14:28:25 +0800
Subject: [PATCH 2673/4131] drm/amdkcl: [4.12] Widely fix to use original
iterator for_each_connector/crtc/plane_in_state
Change-Id: If0c00a2e363d56f24d87b84c603dc82668e72aae
Signed-off-by: Le.Ma <Le.Ma@amd.com>
Reviewed-by: Xiaojie Yuan <Xiaojie.Yuan@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 99 ++++++++++++++++++++++-
1 file changed, 97 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 9b40308..5c8e785 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -605,15 +605,26 @@ static int dm_suspend(void *handle)
static struct amdgpu_dm_connector *
amdgpu_dm_find_first_crtc_matching_connector(struct drm_atomic_state *state,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ struct drm_crtc *crtc,
+ bool from_state_var)
+#else
struct drm_crtc *crtc)
+#endif
{
uint32_t i;
struct drm_connector_state *new_con_state;
struct drm_connector *connector;
struct drm_crtc *crtc_from_state;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_connector_in_state(state, connector, new_con_state, i) {
+ crtc_from_state = from_state_var ? new_con_state->crtc :
+ connector->state->crtc;
+#else
for_each_new_connector_in_state(state, connector, new_con_state, i) {
crtc_from_state = new_con_state->crtc;
+#endif
if (crtc_from_state == crtc)
return to_amdgpu_dm_connector(connector);
@@ -680,7 +691,11 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev)
}
/* Force mode set in atomic comit */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_crtc_in_state(adev->dm.cached_state, crtc, new_crtc_state, i)
+#else
for_each_new_crtc_in_state(adev->dm.cached_state, crtc, new_crtc_state, i)
+#endif
new_crtc_state->active_changed = true;
ret = drm_atomic_helper_resume(ddev, adev->dm.cached_state);
@@ -4029,7 +4044,12 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
unsigned long flags;
/* update planes when needed */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_plane_in_state(state, plane, old_plane_state, i) {
+ new_plane_state = plane->state;
+#else
for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
+#endif
struct drm_crtc *crtc = new_plane_state->crtc;
struct drm_crtc_state *new_crtc_state;
struct drm_framebuffer *fb = new_plane_state->fb;
@@ -4141,7 +4161,12 @@ static int amdgpu_dm_atomic_commit(struct drm_device *dev,
* it will update crtc->dm_crtc_state->stream pointer which is used in
* the ISRs.
*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_crtc_in_state(state, crtc, new_crtc_state, i) {
+ old_crtc_state = crtc->state;
+#else
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
+#endif
struct dm_crtc_state *dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);
struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
@@ -4176,7 +4201,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
dm_state = to_dm_atomic_state(state);
/* update changed items */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
+ new_crtc_state = crtc->state;
+#else
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
+#endif
struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
@@ -4245,8 +4275,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
* are removed from freesync module
*/
if (adev->dm.freesync_module) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
+ new_crtc_state = crtc->state;
+#else
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
new_crtc_state, i) {
+#endif
struct amdgpu_dm_connector *aconnector = NULL;
struct dm_connector_state *dm_new_con_state = NULL;
struct amdgpu_crtc *acrtc = NULL;
@@ -4272,7 +4307,11 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
aconnector =
amdgpu_dm_find_first_crtc_matching_connector(
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ state, crtc, false);
+#else
state, crtc);
+#endif
if (!aconnector) {
DRM_DEBUG_DRIVER("Atomic commit: Failed to "
"find connector for acrtc "
@@ -4285,8 +4324,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
mod_freesync_add_stream(adev->dm.freesync_module,
dm_new_crtc_state->stream,
&aconnector->caps);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ new_con_state = aconnector->base.state;
+#else
new_con_state = drm_atomic_get_new_connector_state(
state, &aconnector->base);
+#endif
dm_new_con_state = to_dm_connector_state(new_con_state);
mod_freesync_set_user_enable(adev->dm.freesync_module,
@@ -4299,7 +4342,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
if (dm_state->context)
WARN_ON(!dc_commit_state(dm->dc, dm_state->context));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ new_crtc_state = crtc->state;
+#else
for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
+#endif
struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);
dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
@@ -4316,14 +4364,23 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
}
/* Handle scaling and underscan changes*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_connector_in_state(state, connector, old_con_state, i) {
+ new_con_state = connector->state;
+#else
for_each_oldnew_connector_in_state(state, connector, old_con_state, new_con_state, i) {
+#endif
struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);
struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state);
struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc);
struct dc_stream_status *status = NULL;
if (acrtc)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ new_crtc_state = acrtc->base.state;
+#else
new_crtc_state = drm_atomic_get_new_crtc_state(state, &acrtc->base);
+#endif
/* Skip any modesets/resets */
if (!acrtc || drm_atomic_crtc_needs_modeset(new_crtc_state))
@@ -4355,8 +4412,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
dm_error("%s: Failed to update stream scaling!\n", __func__);
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
+ new_crtc_state = crtc->state;
+#else
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
new_crtc_state, i) {
+#endif
/*
* loop to enable interrupts on newly arrived crtc
*/
@@ -4382,7 +4444,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
}
/* update planes when needed per crtc*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
+ new_crtc_state = crtc->state;
+#else
for_each_new_crtc_in_state(state, crtc, new_crtc_state, j) {
+#endif
dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
if (dm_new_crtc_state->stream)
@@ -4395,7 +4462,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
* mark consumed event for drm_atomic_helper_commit_hw_done
*/
spin_lock_irqsave(&adev->ddev->event_lock, flags);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
+ new_crtc_state = crtc->state;
+#else
for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
+#endif
if (new_crtc_state->event)
drm_send_event_locked(dev, &new_crtc_state->event->base);
@@ -4569,7 +4641,12 @@ static int dm_update_crtcs_state(struct dc *dc,
/*TODO Move this code into dm_crtc_atomic_check once we get rid of dc_validation_set */
/* update changed items */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_crtc_in_state(state, crtc, new_crtc_state, i) {
+ old_crtc_state = crtc->state;
+#else
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
+#endif
struct amdgpu_crtc *acrtc = NULL;
struct amdgpu_dm_connector *aconnector = NULL;
struct drm_connector_state *new_con_state = NULL;
@@ -4581,7 +4658,12 @@ static int dm_update_crtcs_state(struct dc *dc,
dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
acrtc = to_amdgpu_crtc(crtc);
- aconnector = amdgpu_dm_find_first_crtc_matching_connector(state, crtc);
+ aconnector = amdgpu_dm_find_first_crtc_matching_connector(
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ state, crtc, true);
+#else
+ state, crtc);
+#endif
/* TODO This hack should go away */
if (aconnector && enable) {
@@ -4881,7 +4963,11 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
* we should not add it to list of affected planes.
*/
if (state->legacy_cursor_update) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_crtc_in_state(state, crtc, new_crtc_state, i) {
+#else
for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
+#endif
if (new_crtc_state->color_mgmt_changed) {
ret = drm_atomic_add_affected_planes(state, crtc);
if (ret)
@@ -4890,7 +4976,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
}
} else {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
- for_each_crtc_in_state(state, crtc, crtc_state, i) {
+ for_each_crtc_in_state(state, crtc, new_crtc_state, i) {
old_crtc_state = crtc->state;
#else
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
@@ -4949,14 +5035,23 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
* new stream into context w\o causing full reset. Need to
* decide how to handle.
*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_connector_in_state(state, connector, new_con_state, i) {
+ old_con_state = connector->state;
+#else
for_each_oldnew_connector_in_state(state, connector, old_con_state, new_con_state, i) {
+#endif
struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state);
struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state);
struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc);
/* Skip any modesets/resets */
if (!acrtc || drm_atomic_crtc_needs_modeset(
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ acrtc->base.state))
+#else
drm_atomic_get_new_crtc_state(state, &acrtc->base)))
+#endif
continue;
/* Skip any thing not scale or underscan changes */
--
2.7.4
|
