Commit a106ed98 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: use devres-managed allocation for HW blocks 



Use devm_kzalloc to create HW block structure. This allows us to remove
corresponding kfree and drop all dpu_hw_*_destroy() functions as well as
dpu_rm_destroy(), which becomes empty afterwards.

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/570041/
Link: https://lore.kernel.org/r/20231201211845.1026967-7-dmitry.baryshkov@linaro.org
parent 1e897dcc

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

+9 −10
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
 */



#include <linux/delay.h>



#include <drm/drm_managed.h>



#include "dpu_hwio.h"

#include "dpu_hw_ctl.h"

#include "dpu_kms.h"
@@ -680,14 +683,15 @@ static void _setup_ctl_ops(struct dpu_hw_ctl_ops *ops, 
		ops->set_active_pipes = dpu_hw_ctl_set_fetch_pipe_active;

};



struct dpu_hw_ctl *dpu_hw_ctl_init(const struct dpu_ctl_cfg *cfg,

struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *dev,

				   const struct dpu_ctl_cfg *cfg,

				   void __iomem *addr,

				   u32 mixer_count,

				   const struct dpu_lm_cfg *mixer)

{

	struct dpu_hw_ctl *c;



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

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

	if (!c)

		return ERR_PTR(-ENOMEM);
@@ -702,8 +706,3 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(const struct dpu_ctl_cfg *cfg, 


	return c;

}
 


void dpu_hw_ctl_destroy(struct dpu_hw_ctl *ctx)

{

	kfree(ctx);

}

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

+6 −10
Original line number Diff line number Diff line
@@ -274,20 +274,16 @@ static inline struct dpu_hw_ctl *to_dpu_hw_ctl(struct dpu_hw_blk *hw) 
/**

 * dpu_hw_ctl_init() - Initializes the ctl_path hw driver object.

 * Should be called before accessing any ctl_path register.

 * @dev:  Corresponding device for devres management

 * @cfg:  ctl_path catalog entry for which driver object is required

 * @addr: mapped register io address of MDP

 * @mixer_count: Number of mixers in @mixer

 * @mixer: Pointer to an array of Layer Mixers defined in the catalog

 */

struct dpu_hw_ctl *dpu_hw_ctl_init(const struct dpu_ctl_cfg *cfg,

struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *dev,

				   const struct dpu_ctl_cfg *cfg,

				   void __iomem *addr,

				   u32 mixer_count,

				   const struct dpu_lm_cfg *mixer);



/**

 * dpu_hw_ctl_destroy(): Destroys ctl driver context

 * should be called to free the context

 */

void dpu_hw_ctl_destroy(struct dpu_hw_ctl *ctx);



#endif /*_DPU_HW_CTL_H */

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

+5 −7
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
 * Copyright (c) 2020-2022, Linaro Limited

 */



#include <drm/drm_managed.h>



#include <drm/display/drm_dsc_helper.h>



#include "dpu_kms.h"
@@ -188,12 +190,13 @@ static void _setup_dsc_ops(struct dpu_hw_dsc_ops *ops, 
		ops->dsc_bind_pingpong_blk = dpu_hw_dsc_bind_pingpong_blk;

};



struct dpu_hw_dsc *dpu_hw_dsc_init(const struct dpu_dsc_cfg *cfg,

struct dpu_hw_dsc *dpu_hw_dsc_init(struct drm_device *dev,

				   const struct dpu_dsc_cfg *cfg,

				   void __iomem *addr)

{

	struct dpu_hw_dsc *c;



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

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

	if (!c)

		return ERR_PTR(-ENOMEM);
@@ -206,8 +209,3 @@ struct dpu_hw_dsc *dpu_hw_dsc_init(const struct dpu_dsc_cfg *cfg, 


	return c;

}
 


void dpu_hw_dsc_destroy(struct dpu_hw_dsc *dsc)

{

	kfree(dsc);

}

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

+7 −3
Original line number Diff line number Diff line
@@ -64,20 +64,24 @@ struct dpu_hw_dsc { 


/**

 * dpu_hw_dsc_init() - Initializes the DSC hw driver object.

 * @dev:  Corresponding device for devres management

 * @cfg:  DSC catalog entry for which driver object is required

 * @addr: Mapped register io address of MDP

 * Return: Error code or allocated dpu_hw_dsc context

 */

struct dpu_hw_dsc *dpu_hw_dsc_init(const struct dpu_dsc_cfg *cfg,

struct dpu_hw_dsc *dpu_hw_dsc_init(struct drm_device *dev,

				   const struct dpu_dsc_cfg *cfg,

				   void __iomem *addr);



/**

 * dpu_hw_dsc_init_1_2() - initializes the v1.2 DSC hw driver object

 * @dev:  Corresponding device for devres management

 * @cfg:  DSC catalog entry for which driver object is required

 * @addr: Mapped register io address of MDP

 * Returns: Error code or allocated dpu_hw_dsc context

 */

struct dpu_hw_dsc *dpu_hw_dsc_init_1_2(const struct dpu_dsc_cfg *cfg,

struct dpu_hw_dsc *dpu_hw_dsc_init_1_2(struct drm_device *dev,

				       const struct dpu_dsc_cfg *cfg,

				       void __iomem *addr);



/**

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

+5 −2
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
 * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved

 */



#include <drm/drm_managed.h>



#include <drm/display/drm_dsc_helper.h>



#include "dpu_kms.h"
@@ -367,12 +369,13 @@ static void _setup_dcs_ops_1_2(struct dpu_hw_dsc_ops *ops, 
	ops->dsc_bind_pingpong_blk = dpu_hw_dsc_bind_pingpong_blk_1_2;

}



struct dpu_hw_dsc *dpu_hw_dsc_init_1_2(const struct dpu_dsc_cfg *cfg,

struct dpu_hw_dsc *dpu_hw_dsc_init_1_2(struct drm_device *dev,

				       const struct dpu_dsc_cfg *cfg,

				       void __iomem *addr)

{

	struct dpu_hw_dsc *c;



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

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

	if (!c)

		return ERR_PTR(-ENOMEM);