Commit 531d5313 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/mdp5: use devres-managed allocation for SMP data 



Use devm_kzalloc to create SMP data structure. This allows us
to remove corresponding kfree and drop mdp5_smp_destroy() function.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/546172/
Link: https://lore.kernel.org/r/20230708010407.3871346-7-dmitry.baryshkov@linaro.org
parent 323e9a18

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+0 −3
Original line number Diff line number Diff line
@@ -618,9 +618,6 @@ static void mdp5_destroy(struct mdp5_kms *mdp5_kms) 
{

	int i;



	if (mdp5_kms->smp)

		mdp5_smp_destroy(mdp5_kms->smp);



	for (i = 0; i < mdp5_kms->num_intfs; i++)

		kfree(mdp5_kms->intfs[i]);

drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c

+4 −15
Original line number Diff line number Diff line
@@ -370,23 +370,17 @@ void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p) 
		drm_modeset_unlock(&mdp5_kms->glob_state_lock);

}



void mdp5_smp_destroy(struct mdp5_smp *smp)

{

	kfree(smp);

}



struct mdp5_smp *mdp5_smp_init(struct mdp5_kms *mdp5_kms, const struct mdp5_smp_block *cfg)

{

	struct drm_device *dev = mdp5_kms->dev;

	struct mdp5_smp_state *state;

	struct mdp5_global_state *global_state;

	struct mdp5_smp *smp;

	int ret;



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

	if (unlikely(!smp)) {

		ret = -ENOMEM;

		goto fail;

	}

	smp = devm_kzalloc(dev->dev, sizeof(*smp), GFP_KERNEL);

	if (unlikely(!smp))

		return ERR_PTR(-ENOMEM);



	smp->dev = mdp5_kms->dev;

	smp->blk_cnt = cfg->mmb_count;
@@ -400,9 +394,4 @@ struct mdp5_smp *mdp5_smp_init(struct mdp5_kms *mdp5_kms, const struct mdp5_smp_ 
	memcpy(smp->reserved, cfg->reserved, sizeof(smp->reserved));



	return smp;

fail:

	if (smp)

		mdp5_smp_destroy(smp);



	return ERR_PTR(ret);

}

drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ struct mdp5_smp; 


struct mdp5_smp *mdp5_smp_init(struct mdp5_kms *mdp5_kms,

		const struct mdp5_smp_block *cfg);

void  mdp5_smp_destroy(struct mdp5_smp *smp);



void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p);