Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f701695 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Drop plane argument from __drm_atomic_helper_plane_destroy_state 



It's unused, and really this helper should only look at the state
structure and nothing else.

v2: Fix commit message (Laurent).

v3: Rebase onto mtk driver merge.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Mark Yao <mark.yao@rock-chips.com>
Acked-by: default avatarThierry Reding <thierry.reding@gmail.com>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1462804451-15318-2-git-send-email-daniel.vetter@ffwll.ch
parent ec2dc6a0

drivers/gpu/drm/drm_atomic_helper.c

+3 −5
Original line number Diff line number Diff line
@@ -2636,7 +2636,7 @@ EXPORT_SYMBOL(drm_atomic_helper_crtc_destroy_state); 
void drm_atomic_helper_plane_reset(struct drm_plane *plane)

{

	if (plane->state)

		__drm_atomic_helper_plane_destroy_state(plane, plane->state);

		__drm_atomic_helper_plane_destroy_state(plane->state);



	kfree(plane->state);

	plane->state = kzalloc(sizeof(*plane->state), GFP_KERNEL);
@@ -2691,15 +2691,13 @@ EXPORT_SYMBOL(drm_atomic_helper_plane_duplicate_state); 


/**

 * __drm_atomic_helper_plane_destroy_state - release plane state

 * @plane: plane object

 * @state: plane state object to release

 *

 * Releases all resources stored in the plane state without actually freeing

 * the memory of the plane state. This is useful for drivers that subclass the

 * plane state.

 */

void __drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,

					     struct drm_plane_state *state)

void __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state)

{

	if (state->fb)

		drm_framebuffer_unreference(state->fb);
@@ -2717,7 +2715,7 @@ EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state); 
void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,

					   struct drm_plane_state *state)

{

	__drm_atomic_helper_plane_destroy_state(plane, state);

	__drm_atomic_helper_plane_destroy_state(state);

	kfree(state);

}

EXPORT_SYMBOL(drm_atomic_helper_plane_destroy_state);

drivers/gpu/drm/exynos/exynos_drm_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void exynos_drm_plane_destroy_state(struct drm_plane *plane, 
{

	struct exynos_drm_plane_state *old_exynos_state =

					to_exynos_plane_state(old_state);

	__drm_atomic_helper_plane_destroy_state(plane, old_state);

	__drm_atomic_helper_plane_destroy_state(old_state);

	kfree(old_exynos_state);

}

drivers/gpu/drm/mediatek/mtk_drm_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static struct drm_plane_state *mtk_plane_duplicate_state(struct drm_plane *plane 
static void mtk_drm_plane_destroy_state(struct drm_plane *plane,

					struct drm_plane_state *state)

{

	__drm_atomic_helper_plane_destroy_state(plane, state);

	__drm_atomic_helper_plane_destroy_state(state);

	kfree(to_mtk_plane_state(state));

}

drivers/gpu/drm/omapdrm/omap_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ omap_plane_atomic_duplicate_state(struct drm_plane *plane) 
static void omap_plane_atomic_destroy_state(struct drm_plane *plane,

					    struct drm_plane_state *state)

{

	__drm_atomic_helper_plane_destroy_state(plane, state);

	__drm_atomic_helper_plane_destroy_state(state);

	kfree(to_omap_plane_state(state));

}

drivers/gpu/drm/rcar-du/rcar_du_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ rcar_du_plane_atomic_duplicate_state(struct drm_plane *plane) 
static void rcar_du_plane_atomic_destroy_state(struct drm_plane *plane,

					       struct drm_plane_state *state)

{

	__drm_atomic_helper_plane_destroy_state(plane, state);

	__drm_atomic_helper_plane_destroy_state(state);

	kfree(to_rcar_plane_state(state));

}