Commit 481d5dbb authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: change catalog->dma_cfg to be a const pointer 



Change dpu_mdss_cfg::dma_cfg to be a const pointer rather than embedding
the dpu_reg_dma_cfg struct into the struct dpu_mdss_cfg.

Reported-by: default avatarkernel test robot <lkp@intel.com>
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/488162/
Link: https://lore.kernel.org/r/20220602202447.1755115-6-dmitry.baryshkov@linaro.org


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

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

+6 −6
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ static void sdm845_cfg_init(struct dpu_mdss_cfg *dpu_cfg) 
		.vbif_count = ARRAY_SIZE(sdm845_vbif),

		.vbif = sdm845_vbif,

		.reg_dma_count = 1,

		.dma_cfg = sdm845_regdma,

		.dma_cfg = &sdm845_regdma,

		.perf = &sdm845_perf_data,

		.mdss_irqs = IRQ_SDM845_MASK,

	};
@@ -1813,7 +1813,7 @@ static void sc7180_cfg_init(struct dpu_mdss_cfg *dpu_cfg) 
		.vbif_count = ARRAY_SIZE(sdm845_vbif),

		.vbif = sdm845_vbif,

		.reg_dma_count = 1,

		.dma_cfg = sdm845_regdma,

		.dma_cfg = &sdm845_regdma,

		.perf = &sc7180_perf_data,

		.mdss_irqs = IRQ_SC7180_MASK,

	};
@@ -1846,7 +1846,7 @@ static void sm8150_cfg_init(struct dpu_mdss_cfg *dpu_cfg) 
		.vbif_count = ARRAY_SIZE(sdm845_vbif),

		.vbif = sdm845_vbif,

		.reg_dma_count = 1,

		.dma_cfg = sm8150_regdma,

		.dma_cfg = &sm8150_regdma,

		.perf = &sm8150_perf_data,

		.mdss_irqs = IRQ_SDM845_MASK,

	};
@@ -1877,7 +1877,7 @@ static void sc8180x_cfg_init(struct dpu_mdss_cfg *dpu_cfg) 
		.vbif_count = ARRAY_SIZE(sdm845_vbif),

		.vbif = sdm845_vbif,

		.reg_dma_count = 1,

		.dma_cfg = sm8150_regdma,

		.dma_cfg = &sm8150_regdma,

		.perf = &sc8180x_perf_data,

		.mdss_irqs = IRQ_SC8180X_MASK,

	};
@@ -1912,7 +1912,7 @@ static void sm8250_cfg_init(struct dpu_mdss_cfg *dpu_cfg) 
		.wb_count = ARRAY_SIZE(sm8250_wb),

		.wb = sm8250_wb,

		.reg_dma_count = 1,

		.dma_cfg = sm8250_regdma,

		.dma_cfg = &sm8250_regdma,

		.perf = &sm8250_perf_data,

		.mdss_irqs = IRQ_SM8250_MASK,

	};
@@ -1967,7 +1967,7 @@ static void qcm2290_cfg_init(struct dpu_mdss_cfg *dpu_cfg) 
		.vbif_count = ARRAY_SIZE(sdm845_vbif),

		.vbif = sdm845_vbif,

		.reg_dma_count = 1,

		.dma_cfg = sdm845_regdma,

		.dma_cfg = &sdm845_regdma,

		.perf = &qcm2290_perf_data,

		.mdss_irqs = IRQ_SC7180_MASK,

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ struct dpu_mdss_cfg { 
	const struct dpu_wb_cfg *wb;



	u32 reg_dma_count;

	struct dpu_reg_dma_cfg dma_cfg;

	const struct dpu_reg_dma_cfg *dma_cfg;



	u32 ad_count;