Commit 81af99cb authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Manikandan Muralidharan
Browse files

drm/atmel-hlcdc: destroy properly the plane state in the reset callback 



If there is a plane state to destroy when doing a plane reset, destroy
it using the atmel_hlcdc_plane_destroy_state() function. So we call
__drm_atomic_helper_plane_destroy_state() and avoid code duplication.

Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@microchip.com>
Reviewed-by: default avatarManikandan Muralidharan <manikandan.m@microchip.com>
Link: https://patch.msgid.link/20251218-lcd_cleanup_mainline-v2-8-df837aba878f@microchip.com


Signed-off-by: default avatarManikandan Muralidharan <manikandan.m@microchip.com>
parent 4bad57c2

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+26 −26
Original line number Diff line number Diff line
@@ -1155,32 +1155,6 @@ static int atmel_hlcdc_plane_alloc_dscrs(struct drm_plane *p, 
	return -ENOMEM;

}



static void atmel_hlcdc_plane_reset(struct drm_plane *p)

{

	struct atmel_hlcdc_plane_state *state;



	if (p->state) {

		state = drm_plane_state_to_atmel_hlcdc_plane_state(p->state);



		if (state->base.fb)

			drm_framebuffer_put(state->base.fb);



		kfree(state);

		p->state = NULL;

	}



	state = kzalloc(sizeof(*state), GFP_KERNEL);

	if (state) {

		if (atmel_hlcdc_plane_alloc_dscrs(p, state)) {

			kfree(state);

			drm_err(p->dev,

				"Failed to allocate initial plane state\n");

			return;

		}

		__drm_atomic_helper_plane_reset(p, &state->base);

	}

}



static struct drm_plane_state *

atmel_hlcdc_plane_atomic_duplicate_state(struct drm_plane *p)

{
@@ -1222,6 +1196,32 @@ static void atmel_hlcdc_plane_atomic_destroy_state(struct drm_plane *p, 
	kfree(state);

}



static void atmel_hlcdc_plane_reset(struct drm_plane *p)

{

	struct atmel_hlcdc_plane_state *state;

	struct atmel_hlcdc_dc *dc = p->dev->dev_private;

	struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p);



	if (p->state) {

		atmel_hlcdc_plane_atomic_destroy_state(p, p->state);

		p->state = NULL;

	}



	state = kzalloc(sizeof(*state), GFP_KERNEL);

	if (state) {

		if (atmel_hlcdc_plane_alloc_dscrs(p, state)) {

			kfree(state);

			drm_err(p->dev,

				"Failed to allocate initial plane state\n");

			return;

		}

		__drm_atomic_helper_plane_reset(p, &state->base);

	}



	if (plane->layer.desc->layout.csc)

		dc->desc->ops->lcdc_csc_init(plane, plane->layer.desc);

}



static const struct drm_plane_funcs layer_plane_funcs = {

	.update_plane = drm_atomic_helper_update_plane,

	.disable_plane = drm_atomic_helper_disable_plane,