Commit 5a9d5015 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: shift IRQ indices by 1 



In order to simplify IRQ declarations, shift IRQ indices by 1. This
makes 0 the 'no IRQ' value. Thanks to this change, we do no longer have
to explicitly set the 'no interrupt' fields in catalog structures.

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/550938/
Link: https://lore.kernel.org/r/20230802100426.4184892-9-dmitry.baryshkov@linaro.org


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

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

+0 −4
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = { 
		.prog_fetch_lines_worst_case = 21,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_1", .id = INTF_1,

		.base = 0x6a800, .len = 0x280,
@@ -253,7 +252,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = { 
		.prog_fetch_lines_worst_case = 21,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_2", .id = INTF_2,

		.base = 0x6b000, .len = 0x280,
@@ -262,7 +260,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = { 
		.prog_fetch_lines_worst_case = 21,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_3", .id = INTF_3,

		.base = 0x6b800, .len = 0x280,
@@ -270,7 +267,6 @@ static const struct dpu_intf_cfg msm8998_intf[] = { 
		.prog_fetch_lines_worst_case = 21,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31),

		.intr_tear_rd_ptr = -1,

	},

};

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

+0 −4
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_1", .id = INTF_1,

		.base = 0x6a800, .len = 0x280,
@@ -269,7 +268,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_2", .id = INTF_2,

		.base = 0x6b000, .len = 0x280,
@@ -278,7 +276,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_3", .id = INTF_3,

		.base = 0x6b800, .len = 0x280,
@@ -287,7 +284,6 @@ static const struct dpu_intf_cfg sdm845_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31),

		.intr_tear_rd_ptr = -1,

	},

};

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

+0 −8
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = { 
		.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,
@@ -228,7 +227,6 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = { 
		.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,
@@ -236,7 +234,6 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = { 
		.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,
@@ -244,7 +241,6 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = { 
		.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,
@@ -252,7 +248,6 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = { 
		.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,
@@ -260,7 +255,6 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = { 
		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_2,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

		.intr_rdptr = -1,

	},

};
@@ -307,7 +301,6 @@ static const struct dpu_intf_cfg sm8150_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_1", .id = INTF_1,

		.base = 0x6a800, .len = 0x2bc,
@@ -337,7 +330,6 @@ static const struct dpu_intf_cfg sm8150_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31),

		.intr_tear_rd_ptr = -1,

	},

};

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

+0 −10
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ static const struct dpu_pingpong_cfg sc8180x_pp[] = { 
		.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,
@@ -227,7 +226,6 @@ static const struct dpu_pingpong_cfg sc8180x_pp[] = { 
		.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,
@@ -235,7 +233,6 @@ static const struct dpu_pingpong_cfg sc8180x_pp[] = { 
		.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,
@@ -243,7 +240,6 @@ static const struct dpu_pingpong_cfg sc8180x_pp[] = { 
		.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,
@@ -251,7 +247,6 @@ static const struct dpu_pingpong_cfg sc8180x_pp[] = { 
		.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,
@@ -259,7 +254,6 @@ static const struct dpu_pingpong_cfg sc8180x_pp[] = { 
		.sblk = &sdm845_pp_sblk,

		.merge_3d = MERGE_3D_2,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

		.intr_rdptr = -1,

	},

};
@@ -314,7 +308,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_1", .id = INTF_1,

		.base = 0x6a800, .len = 0x2bc,
@@ -346,7 +339,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_4", .id = INTF_4,

		.base = 0x6c000, .len = 0x280,
@@ -356,7 +348,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 20),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 21),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_5", .id = INTF_5,

		.base = 0x6c800, .len = 0x280,
@@ -366,7 +357,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 22),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 23),

		.intr_tear_rd_ptr = -1,

	},

};

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

+0 −3
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static const struct dpu_pingpong_cfg sm6125_pp[] = { 
		.merge_3d = 0,

		.sblk = &sdm845_pp_sblk,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

		.intr_rdptr = -1,

	}, {

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

		.base = 0x70800, .len = 0xd4,
@@ -137,7 +136,6 @@ static const struct dpu_pingpong_cfg sm6125_pp[] = { 
		.merge_3d = 0,

		.sblk = &sdm845_pp_sblk,

		.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

		.intr_rdptr = -1,

	},

};
@@ -151,7 +149,6 @@ static const struct dpu_intf_cfg sm6125_intf[] = { 
		.prog_fetch_lines_worst_case = 24,

		.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),

		.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),

		.intr_tear_rd_ptr = -1,

	}, {

		.name = "intf_1", .id = INTF_1,

		.base = 0x6a800, .len = 0x2c0,