From f001cec92fdc328ca375e8d7f8e9a56fcf9d2827 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Fri, 22 Oct 2021 15:47:19 +0800 Subject: [PATCH] drm/rockchip: vop: Use __drm_atomic_helper_plane_reset instead of copying the logic A new helper function(__drm_atomic_helper_plane_reset) has been added for linking a plane with its state and resetting the core properties(alpha, rotation, etc.) to their default values. Use that instead of duplicating the logic. Signed-off-by: Andy Yan Change-Id: I3219f6ee0eef49c59277c84ea6efc72ae4a90ef9 --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index be880feb1728..5ed961e1e611 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -2147,10 +2147,9 @@ static void vop_atomic_plane_reset(struct drm_plane *plane) if (!vop_plane_state) return; + __drm_atomic_helper_plane_reset(plane, &vop_plane_state->base); win->state.zpos = win->zpos; vop_plane_state->global_alpha = 0xff; - plane->state = &vop_plane_state->base; - plane->state->plane = plane; } static struct drm_plane_state *