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

drm/atmel-hlcdc: use drmm_crtc_alloc_with_planes() 



Use drmm_crtc_alloc_with_planes() to simplify the code. As we no longer
have to take care about cleanup, we can get rid of
atmel_hlcdc_crtc_destroy().

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-6-df837aba878f@microchip.com


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

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

+6 −26
Original line number Diff line number Diff line
@@ -509,14 +509,6 @@ static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = { 
	.atomic_disable = atmel_hlcdc_crtc_atomic_disable,

};



static void atmel_hlcdc_crtc_destroy(struct drm_crtc *c)

{

	struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);



	drm_crtc_cleanup(c);

	kfree(crtc);

}



static void atmel_hlcdc_crtc_finish_page_flip(struct atmel_hlcdc_crtc *crtc)

{

	struct drm_device *dev = crtc->base.dev;
@@ -607,7 +599,6 @@ static void atmel_hlcdc_crtc_disable_vblank(struct drm_crtc *c) 
static const struct drm_crtc_funcs atmel_hlcdc_crtc_funcs = {

	.page_flip = drm_atomic_helper_page_flip,

	.set_config = drm_atomic_helper_set_config,

	.destroy = atmel_hlcdc_crtc_destroy,

	.reset = atmel_hlcdc_crtc_reset,

	.atomic_duplicate_state =  atmel_hlcdc_crtc_duplicate_state,

	.atomic_destroy_state = atmel_hlcdc_crtc_destroy_state,
@@ -620,15 +611,8 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev) 
	struct atmel_hlcdc_plane *primary = NULL, *cursor = NULL;

	struct atmel_hlcdc_dc *dc = dev->dev_private;

	struct atmel_hlcdc_crtc *crtc;

	int ret;

	int i;



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

	if (!crtc)

		return -ENOMEM;



	crtc->dc = dc;



	for (i = 0; i < ATMEL_HLCDC_MAX_LAYERS; i++) {

		if (!dc->layers[i])

			continue;
@@ -646,13 +630,13 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev) 
			break;

		}

	}



	ret = drm_crtc_init_with_planes(dev, &crtc->base, &primary->base,

					&cursor->base, &atmel_hlcdc_crtc_funcs,

	crtc = drmm_crtc_alloc_with_planes(dev, struct atmel_hlcdc_crtc, base,

					   &primary->base, &cursor->base, &atmel_hlcdc_crtc_funcs,

					   NULL);

	if (ret < 0)

		goto fail;

	if (IS_ERR(crtc))

		return PTR_ERR(crtc);



	crtc->dc = dc;

	crtc->id = drm_crtc_index(&crtc->base);



	for (i = 0; i < ATMEL_HLCDC_MAX_LAYERS; i++) {
@@ -674,8 +658,4 @@ int atmel_hlcdc_crtc_create(struct drm_device *dev) 
	dc->crtc = &crtc->base;



	return 0;



fail:

	atmel_hlcdc_crtc_destroy(&crtc->base);

	return ret;

}