Commit 1a896130 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/armada: Remove prepare/cleanup_fb hooks 



All they do is refcount the fb, which the atomic helpers already do.

This is was necessary with the legacy helpers and I guess just carry
over in the conversion. drm_plane_state always has a full reference
for its ->fb pointer during its entire lifetime,
see __drm_atomic_helper_plane_destroy_state()

Acked-by: default avatarMaxime Ripard <maxime@cerno.tech>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Russell King <linux@armlinux.org.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20210622165511.3169559-10-daniel.vetter@ffwll.ch
parent 29a84084

drivers/gpu/drm/armada/armada_overlay.c

+0 −2
Original line number Diff line number Diff line
@@ -247,8 +247,6 @@ static void armada_drm_overlay_plane_atomic_disable(struct drm_plane *plane, 
}



static const struct drm_plane_helper_funcs armada_overlay_plane_helper_funcs = {

	.prepare_fb	= armada_drm_plane_prepare_fb,

	.cleanup_fb	= armada_drm_plane_cleanup_fb,

	.atomic_check	= armada_drm_plane_atomic_check,

	.atomic_update	= armada_drm_overlay_plane_atomic_update,

	.atomic_disable	= armada_drm_overlay_plane_atomic_disable,

drivers/gpu/drm/armada/armada_plane.c

+0 −29
Original line number Diff line number Diff line
@@ -78,33 +78,6 @@ void armada_drm_plane_calc(struct drm_plane_state *state, u32 addrs[2][3], 
	}

}



int armada_drm_plane_prepare_fb(struct drm_plane *plane,

	struct drm_plane_state *state)

{

	DRM_DEBUG_KMS("[PLANE:%d:%s] [FB:%d]\n",

		plane->base.id, plane->name,

		state->fb ? state->fb->base.id : 0);



	/*

	 * Take a reference on the new framebuffer - we want to

	 * hold on to it while the hardware is displaying it.

	 */

	if (state->fb)

		drm_framebuffer_get(state->fb);

	return 0;

}



void armada_drm_plane_cleanup_fb(struct drm_plane *plane,

	struct drm_plane_state *old_state)

{

	DRM_DEBUG_KMS("[PLANE:%d:%s] [FB:%d]\n",

		plane->base.id, plane->name,

		old_state->fb ? old_state->fb->base.id : 0);



	if (old_state->fb)

		drm_framebuffer_put(old_state->fb);

}



int armada_drm_plane_atomic_check(struct drm_plane *plane,

	struct drm_atomic_state *state)

{
@@ -282,8 +255,6 @@ static void armada_drm_primary_plane_atomic_disable(struct drm_plane *plane, 
}



static const struct drm_plane_helper_funcs armada_primary_plane_helper_funcs = {

	.prepare_fb	= armada_drm_plane_prepare_fb,

	.cleanup_fb	= armada_drm_plane_cleanup_fb,

	.atomic_check	= armada_drm_plane_atomic_check,

	.atomic_update	= armada_drm_primary_plane_atomic_update,

	.atomic_disable	= armada_drm_primary_plane_atomic_disable,

drivers/gpu/drm/armada/armada_plane.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ struct armada_plane_state { 


void armada_drm_plane_calc(struct drm_plane_state *state, u32 addrs[2][3],

	u16 pitches[3], bool interlaced);

int armada_drm_plane_prepare_fb(struct drm_plane *plane,

	struct drm_plane_state *state);

void armada_drm_plane_cleanup_fb(struct drm_plane *plane,

	struct drm_plane_state *old_state);

int armada_drm_plane_atomic_check(struct drm_plane *plane,