From 39f12dae1f6f7ee7a552b2746e95072f30d8152a Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Wed, 18 Aug 2021 19:27:06 +0800 Subject: [PATCH] drm/rockchip: vop2: Remove prepare_fb/cleanup_fb callback According to commit 9bde4e671f2b1 ("drm/rockchip: vop: fix iommu crash with async atomic") These two callback were added to avoid iommu crash on async commit caused by drm_atomic_clean_old_fb after drm_atomic_async_commit. drm_atomic_clean_old_fb was removed after commit e00fb8564ee9 ("drm: Stop updating plane->crtc/fb/old_fb on atomic drivers") So we can remove them to make life simpler. Change-Id: Iea1f2dbadd9bcfad5b8447831c0d31068d4fa97b Signed-off-by: Andy Yan --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index e62d21e2c4ca..df7a037b21de 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2731,22 +2731,6 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc, } } -static int vop2_plane_prepare_fb(struct drm_plane *plane, - struct drm_plane_state *new_state) -{ - if (plane->state->fb) - drm_framebuffer_get(plane->state->fb); - - return 0; -} - -static void vop2_plane_cleanup_fb(struct drm_plane *plane, - struct drm_plane_state *old_state) -{ - if (old_state->fb) - drm_framebuffer_put(old_state->fb); -} - static int vop2_plane_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) { struct vop2_plane_state *vpstate = to_vop2_plane_state(state); @@ -3246,8 +3230,6 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, struct drm_plane_s } static const struct drm_plane_helper_funcs vop2_plane_helper_funcs = { - .prepare_fb = vop2_plane_prepare_fb, - .cleanup_fb = vop2_plane_cleanup_fb, .atomic_check = vop2_plane_atomic_check, .atomic_update = vop2_plane_atomic_update, .atomic_disable = vop2_plane_atomic_disable,