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: Maxime Ripard <maxime@cerno.tech>
Signed-off-by: Daniel 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

diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index d3e3e5fdc39046442b0791bf8a045045887960b7..424250535fed9e87a088e82250d86061790c27e0 100644 (file)
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -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,

diff --git a/drivers/gpu/drm/armada/armada_plane.c b/drivers/gpu/drm/armada/armada_plane.c
index 40209e49f34a84cc391639a50d3f1df2d1a5dcdd..959d7f0a5108512eb99fe13634b72b10622cfbe3 100644 (file)
--- a/drivers/gpu/drm/armada/armada_plane.c
+++ b/drivers/gpu/drm/armada/armada_plane.c
@@ -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,

diff --git a/drivers/gpu/drm/armada/armada_plane.h b/drivers/gpu/drm/armada/armada_plane.h
index 51dab8d8da22d86b9f67ed0f41306a8373411cdf..368415c609a65b7bd80b1b4cf6df4cf3131688a9 100644 (file)
--- a/drivers/gpu/drm/armada/armada_plane.h
+++ b/drivers/gpu/drm/armada/armada_plane.h
@@ -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,