Commit 1e897dcc authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: use devres-managed allocation for MDP TOP 



Use devm_kzalloc to create MDP TOP structure. This allows us to remove
corresponding kfree and drop dpu_hw_mdp_destroy() function.

Reviewed-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/570047/
Link: https://lore.kernel.org/r/20231201211845.1026967-6-dmitry.baryshkov@linaro.org
parent bdfa47d9

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c

+7 −10
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 */



#include <drm/drm_managed.h>



#include "dpu_hwio.h"

#include "dpu_hw_catalog.h"

#include "dpu_hw_top.h"
@@ -247,7 +249,8 @@ static void _setup_mdp_ops(struct dpu_hw_mdp_ops *ops, 
		ops->intf_audio_select = dpu_hw_intf_audio_select;

}



struct dpu_hw_mdp *dpu_hw_mdptop_init(const struct dpu_mdp_cfg *cfg,

struct dpu_hw_mdp *dpu_hw_mdptop_init(struct drm_device *dev,

				      const struct dpu_mdp_cfg *cfg,

				      void __iomem *addr,

				      const struct dpu_mdss_cfg *m)

{
@@ -256,7 +259,7 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(const struct dpu_mdp_cfg *cfg, 
	if (!addr)

		return ERR_PTR(-EINVAL);



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

	mdp = drmm_kzalloc(dev, sizeof(*mdp), GFP_KERNEL);

	if (!mdp)

		return ERR_PTR(-ENOMEM);
@@ -271,9 +274,3 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(const struct dpu_mdp_cfg *cfg, 


	return mdp;

}
 


void dpu_hw_mdp_destroy(struct dpu_hw_mdp *mdp)

{

	kfree(mdp);

}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h

+5 −3
Original line number Diff line number Diff line
@@ -145,11 +145,13 @@ struct dpu_hw_mdp { 


/**

 * dpu_hw_mdptop_init - initializes the top driver for the passed config

 * @dev:  Corresponding device for devres management

 * @cfg:  MDP TOP configuration from catalog

 * @addr: Mapped register io address of MDP

 * @m:    Pointer to mdss catalog data

 */

struct dpu_hw_mdp *dpu_hw_mdptop_init(const struct dpu_mdp_cfg *cfg,

struct dpu_hw_mdp *dpu_hw_mdptop_init(struct drm_device *dev,

				      const struct dpu_mdp_cfg *cfg,

				      void __iomem *addr,

				      const struct dpu_mdss_cfg *m);

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+2 −3
Original line number Diff line number Diff line
@@ -810,8 +810,6 @@ static void _dpu_kms_hw_destroy(struct dpu_kms *dpu_kms) 


	dpu_kms->catalog = NULL;



	if (dpu_kms->hw_mdp)

		dpu_hw_mdp_destroy(dpu_kms->hw_mdp);

	dpu_kms->hw_mdp = NULL;

}
@@ -1090,7 +1088,8 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 


	dpu_kms->rm_init = true;



	dpu_kms->hw_mdp = dpu_hw_mdptop_init(dpu_kms->catalog->mdp,

	dpu_kms->hw_mdp = dpu_hw_mdptop_init(dev,

					     dpu_kms->catalog->mdp,

					     dpu_kms->mmio,

					     dpu_kms->catalog);

	if (IS_ERR(dpu_kms->hw_mdp)) {