[Intel-gfx] [PATCH 2/3] drm: Drop crtc argument from __drm_atomic_helper_connector_destroy_state

Laurent Pinchart laurent.pinchart at ideasonboard.com
Mon May 9 11:50:46 UTC 2016


Hi Daniel,

Thank you for the patch.

On Friday 06 May 2016 10:32:29 Daniel Vetter wrote:
> It's unused, and really this helper should only look at the state
> structure and nothing else.
> 
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Thierry Reding <thierry.reding at gmail.com>
> Cc: Eric Anholt <eric at anholt.net>
> Cc: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
> Cc: Inki Dae <inki.dae at samsung.com>
> Cc: Tomi Valkeinen <tomi.valkeinen at ti.com>
> Cc: Mark Yao <mark.yao at rock-chips.com>
> Acked-by: Thierry Reding <thierry.reding at gmail.com>
> Acked-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

Acked-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> ---
>  drivers/gpu/drm/drm_atomic_helper.c         | 8 +++-----
>  drivers/gpu/drm/exynos/exynos_drm_plane.c   | 2 +-
>  drivers/gpu/drm/omapdrm/omap_plane.c        | 2 +-
>  drivers/gpu/drm/rcar-du/rcar_du_plane.c     | 2 +-
>  drivers/gpu/drm/rcar-du/rcar_du_vsp.c       | 2 +-
>  drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +-
>  drivers/gpu/drm/tegra/dc.c                  | 4 ++--
>  drivers/gpu/drm/vc4/vc4_plane.c             | 2 +-
>  include/drm/drm_atomic_helper.h             | 3 +--
>  9 files changed, 12 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c
> b/drivers/gpu/drm/drm_atomic_helper.c index 137bb51269c2..eb79073c0086
> 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -2617,7 +2617,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);
> @@ -2672,15 +2672,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);
> @@ -2698,7 +2696,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);
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> b/drivers/gpu/drm/exynos/exynos_drm_plane.c index
> 50185ac347b2..55f1d37c666a 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> @@ -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);
>  }
> 
> diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c
> b/drivers/gpu/drm/omapdrm/omap_plane.c index 93ee538a99f5..5252ab720e70
> 100644
> --- a/drivers/gpu/drm/omapdrm/omap_plane.c
> +++ b/drivers/gpu/drm/omapdrm/omap_plane.c
> @@ -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));
>  }
> 
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
> b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index 8460ae1ffa4b..d445e67f78e1
> 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
> @@ -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));
>  }
> 
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
> b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index de7ef041182b..e671a7cd3463
> 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c
> @@ -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, 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));
>  }
> 
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index
> 80d0f95820c4..1c4d5b5a70a2 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -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);
> 
> -	__drm_atomic_helper_plane_destroy_state(plane, state);
> +	__drm_atomic_helper_plane_destroy_state(state);
> 
>  	kfree(vop_state);
>  }
> diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
> index 39902bbfb3ce..39940f5b7c91 100644
> --- a/drivers/gpu/drm/tegra/dc.c
> +++ b/drivers/gpu/drm/tegra/dc.c
> @@ -434,7 +434,7 @@ static void tegra_plane_reset(struct drm_plane *plane)
>  	struct tegra_plane_state *state;
> 
>  	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 = 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, struct
> drm_plane_state *state)
>  {
> -	__drm_atomic_helper_plane_destroy_state(plane, state);
> +	__drm_atomic_helper_plane_destroy_state(state);
>  	kfree(state);
>  }
> 
> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c
> b/drivers/gpu/drm/vc4/vc4_plane.c index 7b0c72ae02a0..4037b52fde31 100644
> --- a/drivers/gpu/drm/vc4/vc4_plane.c
> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
> @@ -208,7 +208,7 @@ static void vc4_plane_destroy_state(struct drm_plane
> *plane, }
> 
>  	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);
>  }
> 
> diff --git a/include/drm/drm_atomic_helper.h
> b/include/drm/drm_atomic_helper.h index 5abbe1259a2a..e9d661a8bd92 100644
> --- a/include/drm/drm_atomic_helper.h
> +++ b/include/drm/drm_atomic_helper.h
> @@ -126,8 +126,7 @@ void __drm_atomic_helper_plane_duplicate_state(struct
> drm_plane *plane, struct drm_plane_state *state);
>  struct drm_plane_state *
>  drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane);
> -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); void drm_atomic_helper_plane_destroy_state(struct drm_plane
> *plane, struct drm_plane_state *state);

-- 
Regards,

Laurent Pinchart



More information about the Intel-gfx mailing list