2023-03-13 00:56:16

by Benjamin Cheng

Subject: [PATCH] drm/amd/display: Write to correct dirty_rect

When FB_DAMAGE_CLIPS are provided in a non-MPO scenario, the loop does
not use the counter i. This causes the fill_dc_dity_rect() to always
fill dirty_rects[0], causing graphical artifacts when a damage clip
aware DRM client sends more than 1 damage clip.

Instead, use the flip_addrs->dirty_rect_count which is incremented by
fill_dc_dirty_rect() on a successful fill.

Fixes: 30ebe41582d1 ("drm/amd/display: add FB_DAMAGE_CLIPS support")
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2453
Signed-off-by: Benjamin Cheng <[email protected]>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++---
1 file changed, 3 insertions(+), 3 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 8af58bba503f..a89ec2cc4ffc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5130,9 +5130,9 @@ static void fill_dc_dirty_rects(struct drm_plane *plane,

for (; flip_addrs->dirty_rect_count < num_clips; clips++)
fill_dc_dirty_rect(new_plane_state->plane,
- &dirty_rects[i], clips->x1,
- clips->y1, clips->x2 - clips->x1,
- clips->y2 - clips->y1,
+ &dirty_rects[flip_addrs->dirty_rect_count],
+ clips->x1, clips->y1,
+ clips->x2 - clips->x1, clips->y2 - clips->y1,
&flip_addrs->dirty_rect_count,
false);
return;
--
2.39.2

2023-03-13 11:59:21

by Hamza Mahfooz

Subject: Re: [PATCH] drm/amd/display: Write to correct dirty_rect

On 3/12/23 20:47, Benjamin Cheng wrote:
> When FB_DAMAGE_CLIPS are provided in a non-MPO scenario, the loop does
> not use the counter i. This causes the fill_dc_dity_rect() to always
> fill dirty_rects[0], causing graphical artifacts when a damage clip
> aware DRM client sends more than 1 damage clip.
>
> Instead, use the flip_addrs->dirty_rect_count which is incremented by
> fill_dc_dirty_rect() on a successful fill.
>
> Fixes: 30ebe41582d1 ("drm/amd/display: add FB_DAMAGE_CLIPS support")
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2453
> Signed-off-by: Benjamin Cheng <[email protected]>

Applied, thanks for catching this!

> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 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 8af58bba503f..a89ec2cc4ffc 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -5130,9 +5130,9 @@ static void fill_dc_dirty_rects(struct drm_plane *plane,
>
> for (; flip_addrs->dirty_rect_count < num_clips; clips++)
> fill_dc_dirty_rect(new_plane_state->plane,
> - &dirty_rects[i], clips->x1,
> - clips->y1, clips->x2 - clips->x1,
> - clips->y2 - clips->y1,
> + &dirty_rects[flip_addrs->dirty_rect_count],
> + clips->x1, clips->y1,
> + clips->x2 - clips->x1, clips->y2 - clips->y1,
> &flip_addrs->dirty_rect_count,
> false);
> return;

--
Hamza