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
|
From bfcbb3e53fe077ada0c5b56bce881e92889455ee Mon Sep 17 00:00:00 2001
From: "Le.Ma" <Le.Ma@amd.com>
Date: Fri, 8 Dec 2017 11:11:51 +0800
Subject: [PATCH 2835/4131] drm/amdkcl: [4.12] Fix to use original iterator in
amdgpu_dm_display_resume
This fixes patch "drm/amd/display: Fix warnings on S3 resume"
Change-Id: Ic22bc8c2aa64d3fc8268f9543c7a9b7f9d4b6ded
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 | 8 ++++++++
1 file changed, 8 insertions(+)
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 11e90d9..e6bd81a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -723,7 +723,11 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev)
* them here, since they were duplicated as part of the suspend
* procedure.
*/
+#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
dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
if (dm_new_crtc_state->stream) {
WARN_ON(kref_read(&dm_new_crtc_state->stream->refcount) > 1);
@@ -732,7 +736,11 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev)
}
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+ for_each_plane_in_state(adev->dm.cached_state, plane, new_plane_state, i) {
+#else
for_each_new_plane_in_state(adev->dm.cached_state, plane, new_plane_state, i) {
+#endif
dm_new_plane_state = to_dm_plane_state(new_plane_state);
if (dm_new_plane_state->dc_state) {
WARN_ON(kref_read(&dm_new_plane_state->dc_state->refcount) > 1);
--
2.7.4
|
