Commit 062aeade authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

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



Use devm_kzalloc to create configuration data structure. This allows us
to remove corresponding kfree and drop mdp5_cfg_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/546156/
Link: https://lore.kernel.org/r/20230708010407.3871346-3-dmitry.baryshkov@linaro.org
parent ab842041

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

+5 −19
Original line number Diff line number Diff line
@@ -1350,23 +1350,17 @@ int mdp5_cfg_get_hw_rev(struct mdp5_cfg_handler *cfg_handler) 
	return cfg_handler->revision;

}



void mdp5_cfg_destroy(struct mdp5_cfg_handler *cfg_handler)

{

	kfree(cfg_handler);

}



struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms,

		uint32_t major, uint32_t minor)

{

	struct drm_device *dev = mdp5_kms->dev;

	struct mdp5_cfg_handler *cfg_handler;

	const struct mdp5_cfg_handler *cfg_handlers;

	int i, ret = 0, num_handlers;

	int i, num_handlers;



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

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

	if (unlikely(!cfg_handler)) {

		ret = -ENOMEM;

		goto fail;

		return ERR_PTR(-ENOMEM);

	}



	switch (major) {
@@ -1381,8 +1375,7 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms, 
	default:

		DRM_DEV_ERROR(dev->dev, "unexpected MDP major version: v%d.%d\n",

				major, minor);

		ret = -ENXIO;

		goto fail;

		return ERR_PTR(-ENXIO);

	}



	/* only after mdp5_cfg global pointer's init can we access the hw */
@@ -1396,8 +1389,7 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms, 
	if (unlikely(!mdp5_cfg)) {

		DRM_DEV_ERROR(dev->dev, "unexpected MDP minor revision: v%d.%d\n",

				major, minor);

		ret = -ENXIO;

		goto fail;

		return ERR_PTR(-ENXIO);

	}



	cfg_handler->revision = minor;
@@ -1406,10 +1398,4 @@ struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms, 
	DBG("MDP5: %s hw config selected", mdp5_cfg->name);



	return cfg_handler;



fail:

	if (cfg_handler)

		mdp5_cfg_destroy(cfg_handler);



	return ERR_PTR(ret);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -121,6 +121,5 @@ int mdp5_cfg_get_hw_rev(struct mdp5_cfg_handler *cfg_hnd); 


struct mdp5_cfg_handler *mdp5_cfg_init(struct mdp5_kms *mdp5_kms,

		uint32_t major, uint32_t minor);

void mdp5_cfg_destroy(struct mdp5_cfg_handler *cfg_hnd);



#endif /* __MDP5_CFG_H__ */

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

+0 −2
Original line number Diff line number Diff line
@@ -629,8 +629,6 @@ static void mdp5_destroy(struct mdp5_kms *mdp5_kms) 
		mdp5_ctlm_destroy(mdp5_kms->ctlm);

	if (mdp5_kms->smp)

		mdp5_smp_destroy(mdp5_kms->smp);

	if (mdp5_kms->cfg)

		mdp5_cfg_destroy(mdp5_kms->cfg);



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

		kfree(mdp5_kms->intfs[i]);