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
|
From 76ee1e7807a611fcadc8fb1fc2591b6b99949af8 Mon Sep 17 00:00:00 2001
From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Date: Mon, 25 Mar 2019 12:06:23 -0400
Subject: [PATCH 1777/2940] drm/amd/display: Update plane scaling parameters
for fast updates
[Why]
Plane scaling parameters are not correctly filled or updated when
performing fast updates.
They're filled when creating the dc plane state and during atomic check.
While the atomic check code path happens for the plane even during fast
updates, the issue is that they're done in place on the dc_plane_state
directly. This dc_plane_state may be the current state plane state
being used by the hardware, so these parameters won't be correctly
programmed.
The new scaling parameters should instead be passed as an update
to the plane.
[How]
Update fill_rects_from_plane_state to not modify dc_plane_state
directly. Update the call sites that use this to fill in the appropriate
values.
Change-Id: I1db42853aeb469cd2a4dfa59d43fa46d710de71b
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Sun peng Li <Sunpeng.Li@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet Lakha@amd.com>
---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 63 ++++++++++++-------
1 file changed, 39 insertions(+), 24 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 e014a00a0021..11d608de408d 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2474,50 +2474,53 @@ static const struct drm_encoder_funcs amdgpu_dm_encoder_funcs = {
};
static bool fill_rects_from_plane_state(const struct drm_plane_state *state,
- struct dc_plane_state *plane_state)
+ struct rect *src_rect,
+ struct rect *dst_rect,
+ struct rect *clip_rect,
+ enum dc_rotation_angle *rotation)
{
- plane_state->src_rect.x = state->src_x >> 16;
- plane_state->src_rect.y = state->src_y >> 16;
+ src_rect->x = state->src_x >> 16;
+ src_rect->y = state->src_y >> 16;
/* we ignore the mantissa for now and do not deal with floating pixels :( */
- plane_state->src_rect.width = state->src_w >> 16;
+ src_rect->width = state->src_w >> 16;
- if (plane_state->src_rect.width == 0)
+ if (src_rect->width == 0)
return false;
- plane_state->src_rect.height = state->src_h >> 16;
- if (plane_state->src_rect.height == 0)
+ src_rect->height = state->src_h >> 16;
+ if (src_rect->height == 0)
return false;
- plane_state->dst_rect.x = state->crtc_x;
- plane_state->dst_rect.y = state->crtc_y;
+ dst_rect->x = state->crtc_x;
+ dst_rect->y = state->crtc_y;
if (state->crtc_w == 0)
return false;
- plane_state->dst_rect.width = state->crtc_w;
+ dst_rect->width = state->crtc_w;
if (state->crtc_h == 0)
return false;
- plane_state->dst_rect.height = state->crtc_h;
+ dst_rect->height = state->crtc_h;
- plane_state->clip_rect = plane_state->dst_rect;
+ *clip_rect = *dst_rect;
switch (state->rotation & DRM_MODE_ROTATE_MASK) {
case DRM_MODE_ROTATE_0:
- plane_state->rotation = ROTATION_ANGLE_0;
+ *rotation = ROTATION_ANGLE_0;
break;
case DRM_MODE_ROTATE_90:
- plane_state->rotation = ROTATION_ANGLE_90;
+ *rotation = ROTATION_ANGLE_90;
break;
case DRM_MODE_ROTATE_180:
- plane_state->rotation = ROTATION_ANGLE_180;
+ *rotation = ROTATION_ANGLE_180;
break;
case DRM_MODE_ROTATE_270:
- plane_state->rotation = ROTATION_ANGLE_270;
+ *rotation = ROTATION_ANGLE_270;
break;
default:
- plane_state->rotation = ROTATION_ANGLE_0;
+ *rotation = ROTATION_ANGLE_0;
break;
}
@@ -2897,7 +2900,11 @@ static int fill_plane_attributes(struct amdgpu_device *adev,
const struct drm_crtc *crtc = plane_state->crtc;
int ret = 0;
- if (!fill_rects_from_plane_state(plane_state, dc_plane_state))
+ if (!fill_rects_from_plane_state(plane_state,
+ &dc_plane_state->src_rect,
+ &dc_plane_state->dst_rect,
+ &dc_plane_state->clip_rect,
+ &dc_plane_state->rotation))
return -EINVAL;
ret = fill_plane_attributes_from_fb(
@@ -4142,12 +4149,17 @@ static int dm_plane_atomic_check(struct drm_plane *plane,
{
struct amdgpu_device *adev = plane->dev->dev_private;
struct dc *dc = adev->dm.dc;
- struct dm_plane_state *dm_plane_state = to_dm_plane_state(state);
+ struct dm_plane_state *dm_plane_state;
+ struct rect src_rect, dst_rect, clip_rect;
+ enum dc_rotation_angle rotation;
+
+ dm_plane_state = to_dm_plane_state(state);
if (!dm_plane_state->dc_state)
return 0;
- if (!fill_rects_from_plane_state(state, dm_plane_state->dc_state))
+ if (!fill_rects_from_plane_state(state, &src_rect, &dst_rect,
+ &clip_rect, &rotation))
return -EINVAL;
if (dc_validate_plane(dc, dm_plane_state->dc_state) == DC_OK)
@@ -5225,9 +5237,13 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
bundle->scaling_infos[planes_count].scaling_quality = dc_plane->scaling_quality;
- bundle->scaling_infos[planes_count].src_rect = dc_plane->src_rect;
- bundle->scaling_infos[planes_count].dst_rect = dc_plane->dst_rect;
- bundle->scaling_infos[planes_count].clip_rect = dc_plane->clip_rect;
+
+ fill_rects_from_plane_state(new_plane_state,
+ &bundle->scaling_infos[planes_count].src_rect,
+ &bundle->scaling_infos[planes_count].dst_rect,
+ &bundle->scaling_infos[planes_count].clip_rect,
+ &bundle->plane_infos[planes_count].rotation);
+
bundle->surface_updates[planes_count].scaling_info = &bundle->scaling_infos[planes_count];
fill_plane_color_attributes(
@@ -5236,7 +5252,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
bundle->plane_infos[planes_count].format = dc_plane->format;
bundle->plane_infos[planes_count].plane_size = dc_plane->plane_size;
- bundle->plane_infos[planes_count].rotation = dc_plane->rotation;
bundle->plane_infos[planes_count].horizontal_mirror = dc_plane->horizontal_mirror;
bundle->plane_infos[planes_count].stereo_format = dc_plane->stereo_format;
bundle->plane_infos[planes_count].tiling_info = dc_plane->tiling_info;
--
2.17.1
|
