Commit 35973be8 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: inline various PP_BLK_* macros 



To simplify making changes to the hardware block definitions, expand
corresponding macros. This way making all the changes are more obvious
and visible in the source files.

Tested-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/545371/
Link: https://lore.kernel.org/r/20230704022136.130522-16-dmitry.baryshkov@linaro.org
parent 4fe37d2d

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

+29 −12
Original line number Diff line number Diff line
@@ -185,18 +185,35 @@ static const struct dpu_lm_cfg msm8998_lm[] = { 
};



static const struct dpu_pingpong_cfg msm8998_pp[] = {

	PP_BLK("pingpong_0", PINGPONG_0, 0x70000, PINGPONG_SDM845_TE2_MASK, 0, sdm845_pp_sblk_te,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),

	PP_BLK("pingpong_1", PINGPONG_1, 0x70800, PINGPONG_SDM845_TE2_MASK, 0, sdm845_pp_sblk_te,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),

	PP_BLK("pingpong_2", PINGPONG_2, 0x71000, PINGPONG_SDM845_MASK, 0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),

	PP_BLK("pingpong_3", PINGPONG_3, 0x71800, PINGPONG_SDM845_MASK, 0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),

	{

		.name = "pingpong_0", .id = PINGPONG_0,

		.base = 0x70000, .len = 0xd4,

		.features = PINGPONG_SDM845_TE2_MASK,

		.sblk = &sdm845_pp_sblk_te,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

		.intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12),

	}, {

		.name = "pingpong_1", .id = PINGPONG_1,

		.base = 0x70800, .len = 0xd4,

		.features = PINGPONG_SDM845_TE2_MASK,

		.sblk = &sdm845_pp_sblk_te,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

		.intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13),

	}, {

		.name = "pingpong_2", .id = PINGPONG_2,

		.base = 0x71000, .len = 0xd4,

		.features = PINGPONG_SDM845_MASK,

		.sblk = &sdm845_pp_sblk,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

		.intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14),

	}, {

		.name = "pingpong_3", .id = PINGPONG_3,

		.base = 0x71800, .len = 0xd4,

		.features = PINGPONG_SDM845_MASK,

		.sblk = &sdm845_pp_sblk,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

		.intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15),

	},

};



static const struct dpu_dsc_cfg msm8998_dsc[] = {

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

+29 −12
Original line number Diff line number Diff line
@@ -209,18 +209,35 @@ static const struct dpu_dspp_cfg sdm845_dspp[] = { 
};



static const struct dpu_pingpong_cfg sdm845_pp[] = {

	PP_BLK("pingpong_0", PINGPONG_0, 0x70000, PINGPONG_SDM845_TE2_MASK, 0, sdm845_pp_sblk_te,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),

	PP_BLK("pingpong_1", PINGPONG_1, 0x70800, PINGPONG_SDM845_TE2_MASK, 0, sdm845_pp_sblk_te,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),

	PP_BLK("pingpong_2", PINGPONG_2, 0x71000, PINGPONG_SDM845_MASK, 0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),

	PP_BLK("pingpong_3", PINGPONG_3, 0x71800, PINGPONG_SDM845_MASK, 0, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),

	{

		.name = "pingpong_0", .id = PINGPONG_0,

		.base = 0x70000, .len = 0xd4,

		.features = PINGPONG_SDM845_TE2_MASK,

		.sblk = &sdm845_pp_sblk_te,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

		.intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12),

	}, {

		.name = "pingpong_1", .id = PINGPONG_1,

		.base = 0x70800, .len = 0xd4,

		.features = PINGPONG_SDM845_TE2_MASK,

		.sblk = &sdm845_pp_sblk_te,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

		.intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13),

	}, {

		.name = "pingpong_2", .id = PINGPONG_2,

		.base = 0x71000, .len = 0xd4,

		.features = PINGPONG_SDM845_MASK,

		.sblk = &sdm845_pp_sblk,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

		.intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14),

	}, {

		.name = "pingpong_3", .id = PINGPONG_3,

		.base = 0x71800, .len = 0xd4,

		.features = PINGPONG_SDM845_MASK,

		.sblk = &sdm845_pp_sblk,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

		.intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15),

	},

};



static const struct dpu_dsc_cfg sdm845_dsc[] = {

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

+49 −18
Original line number Diff line number Diff line
@@ -218,24 +218,55 @@ 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),

			-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),

			-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),

			-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),

			-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),

	PP_BLK("pingpong_5", PINGPONG_5, 0x72800, PINGPONG_SM8150_MASK, MERGE_3D_2, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

			-1),

	{

		.name = "pingpong_0", .id = PINGPONG_0,

		.base = 0x70000, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_0,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_1", .id = PINGPONG_1,

		.base = 0x70800, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_0,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_2", .id = PINGPONG_2,

		.base = 0x71000, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_1,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_3", .id = PINGPONG_3,

		.base = 0x71800, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_1,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_4", .id = PINGPONG_4,

		.base = 0x72000, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_2,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_5", .id = PINGPONG_5,

		.base = 0x72800, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_2,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

		.intr_rdptr = -1,

	},

};



static const struct dpu_merge_3d_cfg sm8150_merge_3d[] = {

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

+49 −18
Original line number Diff line number Diff line
@@ -217,24 +217,55 @@ 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),

			-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),

			-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),

			-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),

			-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),

	PP_BLK("pingpong_5", PINGPONG_5, 0x72800, PINGPONG_SM8150_MASK, MERGE_3D_2, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

			-1),

	{

		.name = "pingpong_0", .id = PINGPONG_0,

		.base = 0x70000, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_0,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_1", .id = PINGPONG_1,

		.base = 0x70800, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_0,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_2", .id = PINGPONG_2,

		.base = 0x71000, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_1,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_3", .id = PINGPONG_3,

		.base = 0x71800, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_1,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_4", .id = PINGPONG_4,

		.base = 0x72000, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_2,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_5", .id = PINGPONG_5,

		.base = 0x72800, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_2,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

		.intr_rdptr = -1,

	},

};



static const struct dpu_merge_3d_cfg sc8180x_merge_3d[] = {

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

+49 −18
Original line number Diff line number Diff line
@@ -218,24 +218,55 @@ 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),

			-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),

			-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),

			-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),

			-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),

	PP_BLK("pingpong_5", PINGPONG_5, 0x72800, PINGPONG_SM8150_MASK, MERGE_3D_2, sdm845_pp_sblk,

			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

			-1),

	{

		.name = "pingpong_0", .id = PINGPONG_0,

		.base = 0x70000, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_0,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_1", .id = PINGPONG_1,

		.base = 0x70800, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_0,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_2", .id = PINGPONG_2,

		.base = 0x71000, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_1,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_3", .id = PINGPONG_3,

		.base = 0x71800, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_1,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_4", .id = PINGPONG_4,

		.base = 0x72000, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_2,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),

		.intr_rdptr = -1,

	}, {

		.name = "pingpong_5", .id = PINGPONG_5,

		.base = 0x72800, .len = 0xd4,

		.features = PINGPONG_SM8150_MASK,

		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_2,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

		.intr_rdptr = -1,

	},

};



static const struct dpu_merge_3d_cfg sm8250_merge_3d[] = {