redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

drm: Drop plane argument from __drm_atomic_helper_plane_destroy_state

Browse source 
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: Thierry Reding <thierry.reding@gmail.com>
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1462804451-15318-2-git-send-email-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2016-05-09 16:34:10 +02:00
parent ec2dc6a0fe
commit 2f701695fd
10 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/drm_atomic_helper.c
View file

@ -2636,7 +2636,7 @@ EXPORT_SYMBOL(drm_atomic_helper_crtc_destroy_state);
void drm_atomic_helper_plane_reset(struct drm_plane *plane) void drm_atomic_helper_plane_reset(struct drm_plane *plane)
{ {
if (plane->state) if (plane->state)
__drm_atomic_helper_plane_destroy_state(plane, plane->state); __drm_atomic_helper_plane_destroy_state(plane->state);
kfree(plane->state); kfree(plane->state);
plane->state = kzalloc(sizeof(*plane->state), GFP_KERNEL); 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 * __drm_atomic_helper_plane_destroy_state - release plane state
* @plane: plane object
* @state: plane state object to release * @state: plane state object to release
* *
* Releases all resources stored in the plane state without actually freeing * 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 * the memory of the plane state. This is useful for drivers that subclass the
* plane state. * plane state.
*/ */
void __drm_atomic_helper_plane_destroy_state(struct drm_plane *plane, void __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state)
struct drm_plane_state *state)
{ {
if (state->fb) if (state->fb)
drm_framebuffer_unreference(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, void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state) struct drm_plane_state *state)
{ {
__drm_atomic_helper_plane_destroy_state(plane, state); __drm_atomic_helper_plane_destroy_state(state);
kfree(state); kfree(state);
} }
EXPORT_SYMBOL(drm_atomic_helper_plane_destroy_state); EXPORT_SYMBOL(drm_atomic_helper_plane_destroy_state);

2
drivers/gpu/drm/exynos/exynos_drm_plane.c
View file

@ -166,7 +166,7 @@ static void exynos_drm_plane_destroy_state(struct drm_plane *plane,
{ {
struct exynos_drm_plane_state *old_exynos_state = struct exynos_drm_plane_state *old_exynos_state =
to_exynos_plane_state(old_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); kfree(old_exynos_state);
} }

2
drivers/gpu/drm/mediatek/mtk_drm_plane.c
View file

@ -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, static void mtk_drm_plane_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state) 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)); kfree(to_mtk_plane_state(state));
} }

2
drivers/gpu/drm/omapdrm/omap_plane.c
View file

@ -245,7 +245,7 @@ omap_plane_atomic_duplicate_state(struct drm_plane *plane)
static void omap_plane_atomic_destroy_state(struct drm_plane *plane, static void omap_plane_atomic_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state) 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)); kfree(to_omap_plane_state(state));
} }

2
drivers/gpu/drm/rcar-du/rcar_du_plane.c
View file

@ -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, static void rcar_du_plane_atomic_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state) 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)); kfree(to_rcar_plane_state(state));
} }

2
drivers/gpu/drm/rcar-du/rcar_du_vsp.c
View file

@ -251,7 +251,7 @@ rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane)
static void rcar_du_vsp_plane_atomic_destroy_state(struct drm_plane *plane, static void rcar_du_vsp_plane_atomic_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state) struct drm_plane_state *state)
{ {
__drm_atomic_helper_plane_destroy_state(plane, state); __drm_atomic_helper_plane_destroy_state(state);
kfree(to_rcar_vsp_plane_state(state)); kfree(to_rcar_vsp_plane_state(state));
} }

2
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View file

@ -822,7 +822,7 @@ static void vop_atomic_plane_destroy_state(struct drm_plane *plane,
{ {
struct vop_plane_state *vop_state = to_vop_plane_state(state); struct vop_plane_state *vop_state = to_vop_plane_state(state);
__drm_atomic_helper_plane_destroy_state(plane, state); __drm_atomic_helper_plane_destroy_state(state);
kfree(vop_state); kfree(vop_state);
} }

4
drivers/gpu/drm/tegra/dc.c
View file

@ -434,7 +434,7 @@ static void tegra_plane_reset(struct drm_plane *plane)
struct tegra_plane_state *state; struct tegra_plane_state *state;
if (plane->state) if (plane->state)
__drm_atomic_helper_plane_destroy_state(plane, plane->state); __drm_atomic_helper_plane_destroy_state(plane->state);
kfree(plane->state); kfree(plane->state);
plane->state = NULL; plane->state = NULL;
@ -466,7 +466,7 @@ static struct drm_plane_state *tegra_plane_atomic_duplicate_state(struct drm_pla
static void tegra_plane_atomic_destroy_state(struct drm_plane *plane, static void tegra_plane_atomic_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state) struct drm_plane_state *state)
{ {
__drm_atomic_helper_plane_destroy_state(plane, state); __drm_atomic_helper_plane_destroy_state(state);
kfree(state); kfree(state);
} }

2
drivers/gpu/drm/vc4/vc4_plane.c
View file

@ -208,7 +208,7 @@ static void vc4_plane_destroy_state(struct drm_plane *plane,
} }
kfree(vc4_state->dlist); kfree(vc4_state->dlist);
__drm_atomic_helper_plane_destroy_state(plane, &vc4_state->base); __drm_atomic_helper_plane_destroy_state(&vc4_state->base);
kfree(state); kfree(state);
} }

3
include/drm/drm_atomic_helper.h
View file

@ -128,8 +128,7 @@ void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane,
struct drm_plane_state *state); struct drm_plane_state *state);
struct drm_plane_state * struct drm_plane_state *
drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane); drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane);
void __drm_atomic_helper_plane_destroy_state(struct drm_plane *plane, void __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state);
struct drm_plane_state *state);
void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane, void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state); struct drm_plane_state *state);