Commit 7105bf94 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Move intel_plane_destroy() into intel_atomic_plane.c 



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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213150220.13580-7-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 13a8aca9

drivers/gpu/drm/i915/display/intel_atomic_plane.c

+13 −0
Original line number Diff line number Diff line
@@ -93,6 +93,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

drivers/gpu/drm/i915/display/intel_atomic_plane.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/display/intel_display.c

+0 −13
Original line number Diff line number Diff line
@@ -7874,19 +7874,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;

drivers/gpu/drm/i915/display/intel_display.h

+0 −1
Original line number Diff line number Diff line
@@ -448,7 +448,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);