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

drm/msm/dpu: constify struct dpu_mdss_cfg 



Mark struct dpu_mdss_cfg instance as a const pointer. This is mostly a
preparation for the next patch.

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


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 481d5dbb

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

+2 −2
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static const struct file_operations dpu_core_perf_mode_fops = { 
int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent)

{

	struct dpu_core_perf *perf = &dpu_kms->perf;

	struct dpu_mdss_cfg *catalog = perf->catalog;

	const struct dpu_mdss_cfg *catalog = perf->catalog;

	struct dentry *entry;



	entry = debugfs_create_dir("core_perf", parent);
@@ -517,7 +517,7 @@ void dpu_core_perf_destroy(struct dpu_core_perf *perf) 


int dpu_core_perf_init(struct dpu_core_perf *perf,

		struct drm_device *dev,

		struct dpu_mdss_cfg *catalog,

		const struct dpu_mdss_cfg *catalog,

		struct clk *core_clk)

{

	perf->dev = dev;

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

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct dpu_core_perf_tune { 
struct dpu_core_perf {

	struct drm_device *dev;

	struct dentry *debugfs_root;

	struct dpu_mdss_cfg *catalog;

	const struct dpu_mdss_cfg *catalog;

	struct clk *core_clk;

	u64 core_clk_rate;

	u64 max_core_clk_rate;
@@ -119,7 +119,7 @@ void dpu_core_perf_destroy(struct dpu_core_perf *perf); 
 */

int dpu_core_perf_init(struct dpu_core_perf *perf,

		struct drm_device *dev,

		struct dpu_mdss_cfg *catalog,

		const struct dpu_mdss_cfg *catalog,

		struct clk *core_clk);



struct dpu_kms;

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

+2 −2
Original line number Diff line number Diff line
@@ -1205,7 +1205,7 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) 
	mutex_unlock(&dpu_enc->enc_lock);

}



static enum dpu_intf dpu_encoder_get_intf(struct dpu_mdss_cfg *catalog,

static enum dpu_intf dpu_encoder_get_intf(const struct dpu_mdss_cfg *catalog,

		enum dpu_intf_type type, u32 controller_id)

{

	int i = 0;
@@ -1222,7 +1222,7 @@ static enum dpu_intf dpu_encoder_get_intf(struct dpu_mdss_cfg *catalog, 
	return INTF_MAX;

}



static enum dpu_wb dpu_encoder_get_wb(struct dpu_mdss_cfg *catalog,

static enum dpu_wb dpu_encoder_get_wb(const struct dpu_mdss_cfg *catalog,

		enum dpu_intf_type type, u32 controller_id)

{

	int i = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static void dpu_encoder_phys_wb_set_qos(struct dpu_encoder_phys *phys_enc) 
{

	struct dpu_hw_wb *hw_wb;

	struct dpu_hw_wb_qos_cfg qos_cfg;

	struct dpu_mdss_cfg *catalog;

	const struct dpu_mdss_cfg *catalog;

	const struct dpu_qos_lut_tbl *qos_lut_tb;



	if (!phys_enc || !phys_enc->dpu_kms || !phys_enc->dpu_kms->catalog) {

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

+3 −8
Original line number Diff line number Diff line
@@ -1987,17 +1987,12 @@ static const struct dpu_mdss_hw_cfg_handler cfg_handler[] = { 
	{ .hw_rev = DPU_HW_VER_720, .cfg_init = sc7280_cfg_init},

};



void dpu_hw_catalog_deinit(struct dpu_mdss_cfg *dpu_cfg)

{

	kfree(dpu_cfg);

}



struct dpu_mdss_cfg *dpu_hw_catalog_init(u32 hw_rev)

const struct dpu_mdss_cfg *dpu_hw_catalog_init(struct device *dev, u32 hw_rev)

{

	int i;

	struct dpu_mdss_cfg *dpu_cfg;



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

	dpu_cfg = devm_kzalloc(dev, sizeof(*dpu_cfg), GFP_KERNEL);

	if (!dpu_cfg)

		return ERR_PTR(-ENOMEM);
@@ -2009,7 +2004,7 @@ struct dpu_mdss_cfg *dpu_hw_catalog_init(u32 hw_rev) 
	}



	DPU_ERROR("unsupported chipset id:%X\n", hw_rev);

	dpu_hw_catalog_deinit(dpu_cfg);



	return ERR_PTR(-ENODEV);

}