On Thu, 13 Feb 2025, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> intel_atomic_plane.c (should rename it really) has become our
> standard place for generic plane code. Move intel_plane_destroy()
> there so it doesn't clutter intel_display.c.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Agreed on the renaming.
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_atomic_plane.c | 13 +++++++++++++
> drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 +
> drivers/gpu/drm/i915/display/intel_display.c | 13 -------------
> drivers/gpu/drm/i915/display/intel_display.h | 1 -
> 4 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> index 8a49d87d9bd9..7e87c052be45 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> @@ -92,6 +92,19 @@ void intel_plane_free(struct intel_plane *plane)
> kfree(plane);
> }
>
> +/**
> + * intel_plane_destroy - destroy a plane
> + * @plane: plane to destroy
> + *
> + * Common destruction function for all types of planes (primary, cursor,
> + * sprite).
> + */
> +void intel_plane_destroy(struct drm_plane *plane)
> +{
> + drm_plane_cleanup(plane);
> + kfree(to_intel_plane(plane));
> +}
> +
> /**
> * intel_plane_duplicate_state - duplicate plane state
> * @plane: drm plane
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> index fb87b3353ab0..e965ea0cb15c 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> @@ -52,6 +52,7 @@ void intel_plane_disable_arm(struct intel_dsb *dsb,
> const struct intel_crtc_state *crtc_state);
> struct intel_plane *intel_plane_alloc(void);
> void intel_plane_free(struct intel_plane *plane);
> +void intel_plane_destroy(struct drm_plane *plane);
> struct drm_plane_state *intel_plane_duplicate_state(struct drm_plane *plane);
> void intel_plane_destroy_state(struct drm_plane *plane,
> struct drm_plane_state *state);
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 0807a4979ea2..4278212a2496 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -8117,19 +8117,6 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
> return 0;
> }
>
> -/**
> - * intel_plane_destroy - destroy a plane
> - * @plane: plane to destroy
> - *
> - * Common destruction function for all types of planes (primary, cursor,
> - * sprite).
> - */
> -void intel_plane_destroy(struct drm_plane *plane)
> -{
> - drm_plane_cleanup(plane);
> - kfree(to_intel_plane(plane));
> -}
> -
> static u32 intel_encoder_possible_clones(struct intel_encoder *encoder)
> {
> struct drm_device *dev = encoder->base.dev;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index e14aa773323e..2e11fc2ba1f4 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -450,7 +450,6 @@ bool intel_pipe_config_compare(const struct intel_crtc_state *current_config,
> const struct intel_crtc_state *pipe_config,
> bool fastset);
>
> -void intel_plane_destroy(struct drm_plane *plane);
> void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state);
> void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state);
> void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state);
--
Jani Nikula, Intel
