Commit edb34ac1 authored Jul 27, 2023 by Dmitry Baryshkov

drm/msm/dpu: drop compatibility INTR defines

While reworking interrupts masks, it was easier to keep old
MDP_INTFn_7xxx_INTR and MDP_INTFn_7xxx_TEAR_INTR symbols. Now it is time
to drop them and use unified symbol names.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/549656/
Link: https://lore.kernel.org/r/20230727144543.1483630-6-dmitry.baryshkov@linaro.org

parent 40f9cedf

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -329,7 +329,7 @@ static const struct dpu_intf_cfg sm8350_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 = DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2),
		.intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2),
		}, {
		.name = "intf_2", .id = INTF_2,
		.base = 0x36000, .len = 0x2c4,
		@@ -339,7 +339,7 @@ static const struct dpu_intf_cfg sm8350_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 = DPU_IRQ_IDX(MDP_INTF2_7xxx_TEAR_INTR, 2),
		.intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF2_TEAR_INTR, 2),
		}, {
		.name = "intf_3", .id = INTF_3,
		.base = 0x37000, .len = 0x280,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,7 @@ static const struct dpu_intf_cfg sc7280_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 = DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2),
		.intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2),
		}, {
		.name = "intf_5", .id = INTF_5,
		.base = 0x39000, .len = 0x280,

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ static const struct dpu_intf_cfg sc8280xp_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 = DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2),
		.intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2),
		}, {
		.name = "intf_2", .id = INTF_2,
		.base = 0x36000, .len = 0x300,
		@@ -354,7 +354,7 @@ static const struct dpu_intf_cfg sc8280xp_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 = DPU_IRQ_IDX(MDP_INTF2_7xxx_TEAR_INTR, 2),
		.intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF2_TEAR_INTR, 2),
		}, {
		.name = "intf_3", .id = INTF_3,
		.base = 0x37000, .len = 0x280,

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -352,7 +352,7 @@ static const struct dpu_intf_cfg sm8450_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 = DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2),
		.intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2),
		}, {
		.name = "intf_2", .id = INTF_2,
		.base = 0x36000, .len = 0x300,
		@@ -362,7 +362,7 @@ static const struct dpu_intf_cfg sm8450_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 = DPU_IRQ_IDX(MDP_INTF2_7xxx_TEAR_INTR, 2),
		.intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF2_TEAR_INTR, 2),
		}, {
		.name = "intf_3", .id = INTF_3,
		.base = 0x37000, .len = 0x280,

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -366,7 +366,7 @@ static const struct dpu_intf_cfg sm8550_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 = DPU_IRQ_IDX(MDP_INTF1_7xxx_TEAR_INTR, 2),
		.intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF1_TEAR_INTR, 2),
		}, {
		.name = "intf_2", .id = INTF_2,
		.base = 0x36000, .len = 0x300,
		@@ -376,7 +376,7 @@ static const struct dpu_intf_cfg sm8550_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 = DPU_IRQ_IDX(MDP_INTF2_7xxx_TEAR_INTR, 2),
		.intr_tear_rd_ptr = DPU_IRQ_IDX(MDP_INTF2_TEAR_INTR, 2),
		}, {
		.name = "intf_3", .id = INTF_3,
		.base = 0x37000, .len = 0x280,