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

drm/msm/dpu: constify DSC data structures 



DSC hw catalog data is not supposed to be changed, so mark it as const
data.

Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
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/530818/
Link: https://lore.kernel.org/r/20230404130622.509628-5-dmitry.baryshkov@linaro.org


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

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

+2 −2
Original line number Diff line number Diff line
@@ -1836,14 +1836,14 @@ static const struct dpu_merge_3d_cfg sm8550_merge_3d[] = { 
	.features = _features, \

	}



static struct dpu_dsc_cfg sdm845_dsc[] = {

static const struct dpu_dsc_cfg sdm845_dsc[] = {

	DSC_BLK("dsc_0", DSC_0, 0x80000, 0),

	DSC_BLK("dsc_1", DSC_1, 0x80400, 0),

	DSC_BLK("dsc_2", DSC_2, 0x80800, 0),

	DSC_BLK("dsc_3", DSC_3, 0x80c00, 0),

};



static struct dpu_dsc_cfg sm8150_dsc[] = {

static const struct dpu_dsc_cfg sm8150_dsc[] = {

	DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_1", DSC_1, 0x80400, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_2", DSC_2, 0x80800, BIT(DPU_DSC_OUTPUT_CTRL)),

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

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ struct dpu_mdss_cfg { 
	const struct dpu_merge_3d_cfg *merge_3d;



	u32 dsc_count;

	struct dpu_dsc_cfg *dsc;

	const struct dpu_dsc_cfg *dsc;



	u32 intf_count;

	const struct dpu_intf_cfg *intf;

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

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static void dpu_hw_dsc_bind_pingpong_blk( 
	DPU_REG_WRITE(c, dsc_ctl_offset, mux_cfg);

}



static struct dpu_dsc_cfg *_dsc_offset(enum dpu_dsc dsc,

static const struct dpu_dsc_cfg *_dsc_offset(enum dpu_dsc dsc,

				       const struct dpu_mdss_cfg *m,

				       void __iomem *addr,

				       struct dpu_hw_blk_reg_map *b)
@@ -207,7 +207,7 @@ struct dpu_hw_dsc *dpu_hw_dsc_init(enum dpu_dsc idx, void __iomem *addr, 
				   const struct dpu_mdss_cfg *m)

{

	struct dpu_hw_dsc *c;

	struct dpu_dsc_cfg *cfg;

	const struct dpu_dsc_cfg *cfg;



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

	if (!c)