Commit f1584d89 authored by Marijn Suijten's avatar Marijn Suijten Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: Remove intr_rdptr from DPU >= 5.0.0 pingpong config 



Now that newer DPU platforms use a readpointer-done interrupt on the
INTF block, stop providing the unused interrupt on the PINGPONG block.

Signed-off-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/534238/
Link: https://lore.kernel.org/r/20230411-dpu-intf-te-v4-22-27ce1a5ab5c6@somainline.org


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

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h

+4 −4
Original line number Diff line number Diff line
@@ -130,16 +130,16 @@ static const struct dpu_dspp_cfg sm8150_dspp[] = { 
static const struct dpu_pingpong_cfg sm8150_pp[] = {

	PP_BLK("pingpong_0", PINGPONG_0, 0x70000, PINGPONG_SM8150_MASK, MERGE_3D_0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),

			-1),

	PP_BLK("pingpong_1", PINGPONG_1, 0x70800, PINGPONG_SM8150_MASK, MERGE_3D_0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),

			-1),

	PP_BLK("pingpong_2", PINGPONG_2, 0x71000, PINGPONG_SM8150_MASK, MERGE_3D_1, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),

			-1),

	PP_BLK("pingpong_3", PINGPONG_3, 0x71800, PINGPONG_SM8150_MASK, MERGE_3D_1, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),

			-1),

	PP_BLK("pingpong_4", PINGPONG_4, 0x72000, PINGPONG_SM8150_MASK, MERGE_3D_2, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),

			-1),

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h

+4 −4
Original line number Diff line number Diff line
@@ -129,16 +129,16 @@ static const struct dpu_dspp_cfg sc8180x_dspp[] = { 
static const struct dpu_pingpong_cfg sc8180x_pp[] = {

	PP_BLK("pingpong_0", PINGPONG_0, 0x70000, PINGPONG_SM8150_MASK, MERGE_3D_0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),

			-1),

	PP_BLK("pingpong_1", PINGPONG_1, 0x70800, PINGPONG_SM8150_MASK, MERGE_3D_0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),

			-1),

	PP_BLK("pingpong_2", PINGPONG_2, 0x71000, PINGPONG_SM8150_MASK, MERGE_3D_1, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),

			-1),

	PP_BLK("pingpong_3", PINGPONG_3, 0x71800, PINGPONG_SM8150_MASK, MERGE_3D_1, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),

			-1),

	PP_BLK("pingpong_4", PINGPONG_4, 0x72000, PINGPONG_SM8150_MASK, MERGE_3D_2, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),

			-1),

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h

+4 −4
Original line number Diff line number Diff line
@@ -131,16 +131,16 @@ static const struct dpu_dspp_cfg sm8250_dspp[] = { 
static const struct dpu_pingpong_cfg sm8250_pp[] = {

	PP_BLK("pingpong_0", PINGPONG_0, 0x70000, PINGPONG_SM8150_MASK, MERGE_3D_0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),

			-1),

	PP_BLK("pingpong_1", PINGPONG_1, 0x70800, PINGPONG_SM8150_MASK, MERGE_3D_0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),

			-1),

	PP_BLK("pingpong_2", PINGPONG_2, 0x71000, PINGPONG_SM8150_MASK, MERGE_3D_1, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),

			-1),

	PP_BLK("pingpong_3", PINGPONG_3, 0x71800, PINGPONG_SM8150_MASK, MERGE_3D_1, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),

			-1),

	PP_BLK("pingpong_4", PINGPONG_4, 0x72000, PINGPONG_SM8150_MASK, MERGE_3D_2, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),

			-1),

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static const struct dpu_dspp_cfg sm6115_dspp[] = { 
static const struct dpu_pingpong_cfg sm6115_pp[] = {

	PP_BLK("pingpong_0", PINGPONG_0, 0x70000, PINGPONG_SM8150_MASK, 0, sdm845_pp_sblk,

		DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

		DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),

		-1),

};



static const struct dpu_intf_cfg sm6115_intf[] = {

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static const struct dpu_dspp_cfg qcm2290_dspp[] = { 
static const struct dpu_pingpong_cfg qcm2290_pp[] = {

	PP_BLK("pingpong_0", PINGPONG_0, 0x70000, PINGPONG_SM8150_MASK, 0, sdm845_pp_sblk,

		DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

		DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),

		-1),

};



static const struct dpu_intf_cfg qcm2290_intf[] = {