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: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Dmitry 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: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
index 43c47a19cd94f5044ffbe20806dea39b6e5a9a59..aa1867943c9fdc4af691a783072150c0dbd0d3fe 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
@@ -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,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
index 88a5177dfdb73e562731873be1a92f97f8eee812..38ac0c1a134bff28add4eb3bf97fe7a2c68ab6e3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
@@ -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,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
index 99acaf917e430450ae4667ec3d09408e8c449960..9392ad2b4d3fef32e6f2d7c8a24c9db0f208b9c8 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
@@ -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,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
index f3de21025ca7341683b7ad27dedce37ac1f3d18a..e07f4c8c25b9f99fb3244c3781a66169079c6496 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
@@ -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,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
index 2491eed10039f1395f5e5b84e80b3dd7d8ba67b0..cec7af6667dc92991681a5bb6b3570d89dcd2f6a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
@@ -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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
index 5f9b437b82a68909b77e34a317dbd44c53ee3f99..94278a3e3483c625a00406c8621f6293e144d152 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
@@ -219,7 +219,6 @@ static const struct dpu_pingpong_cfg sm8250_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 sm8250_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 sm8250_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 sm8250_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 sm8250_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 sm8250_pp[] = {
                .sblk = &sdm845_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
-               .intr_rdptr = -1,
        },
 };
 
@@ -306,7 +300,6 @@ static const struct dpu_intf_cfg sm8250_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,
@@ -336,7 +329,6 @@ static const struct dpu_intf_cfg sm8250_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,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
index d030c08636b4c3432c6b1867794f415c4009eb18..c0d88ddccb28c6cf2ae608a678a7352aef6b3d4f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
@@ -120,7 +120,6 @@ static const struct dpu_pingpong_cfg sc7180_pp[] = {
                .sblk = &sdm845_pp_sblk,
                .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,
@@ -128,7 +127,6 @@ static const struct dpu_pingpong_cfg sc7180_pp[] = {
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
-               .intr_rdptr = -1,
        },
 };
 
@@ -142,7 +140,6 @@ static const struct dpu_intf_cfg sc7180_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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
index 7e6000167ef028b49d9bdb6927c0e93784c3d3b0..57ce14c18defb7979dbc0c6625bd47b1b05aa058 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
@@ -83,7 +83,6 @@ static const struct dpu_pingpong_cfg sm6115_pp[] = {
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
-               .intr_rdptr = -1,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
index cf5db6f296bd87ceb277311d73bb7077f4c7177a..62db84bd15f24acf025162c5cb6f48c53c5a227d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h
@@ -128,7 +128,6 @@ static struct dpu_pingpong_cfg sm6350_pp[] = {
                .sblk = &sdm845_pp_sblk,
                .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,
@@ -136,7 +135,6 @@ static struct dpu_pingpong_cfg sm6350_pp[] = {
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
-               .intr_rdptr = -1,
        },
 };
 
@@ -158,7 +156,6 @@ static const struct dpu_intf_cfg sm6350_intf[] = {
                .prog_fetch_lines_worst_case = 35,
                .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,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
index 87a03aa165540a1570c024ad912d3362f2b2b6ad..fb36fba5171cf53440c65f6793a479cfb455db08 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
@@ -82,7 +82,6 @@ static const struct dpu_pingpong_cfg qcm2290_pp[] = {
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
-               .intr_rdptr = -1,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h
index a327e21c90fbcc12b5829379d521d37fd48e94b2..5a3aad364c7894152a626a2b8adedb7cd843c2af 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h
@@ -85,7 +85,6 @@ static const struct dpu_pingpong_cfg sm6375_pp[] = {
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
-               .intr_rdptr = -1,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
index f8d16f9bf528d87de9a4bea738e9cae50a3c5d90..1709ba57f384024b423c269ce1ebba52ee8dec99 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
@@ -218,7 +218,6 @@ static const struct dpu_pingpong_cfg sm8350_pp[] = {
                .sblk = &sc7280_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 = 0x6a000, .len = 0,
@@ -226,7 +225,6 @@ static const struct dpu_pingpong_cfg sm8350_pp[] = {
                .sblk = &sc7280_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 = 0x6b000, .len = 0,
@@ -234,7 +232,6 @@ static const struct dpu_pingpong_cfg sm8350_pp[] = {
                .sblk = &sc7280_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 = 0x6c000, .len = 0,
@@ -242,7 +239,6 @@ static const struct dpu_pingpong_cfg sm8350_pp[] = {
                .sblk = &sc7280_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 = 0x6d000, .len = 0,
@@ -250,7 +246,6 @@ static const struct dpu_pingpong_cfg sm8350_pp[] = {
                .sblk = &sc7280_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 = 0x6e000, .len = 0,
@@ -258,7 +253,6 @@ static const struct dpu_pingpong_cfg sm8350_pp[] = {
                .sblk = &sc7280_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 sm8350_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 = 0x35000, .len = 0x2c4,
@@ -344,7 +337,6 @@ static const struct dpu_intf_cfg sm8350_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,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
index 3b5061c4402a671690249e3abdf72d3326350b13..15942fa5a8e06f3e24bc8976d8692e5a0b82d4d1 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
@@ -131,7 +131,6 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = {
                .sblk = &sc7280_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
-               .intr_rdptr = -1,
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
@@ -139,7 +138,6 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = {
                .sblk = &sc7280_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
-               .intr_rdptr = -1,
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
@@ -147,7 +145,6 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = {
                .sblk = &sc7280_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
-               .intr_rdptr = -1,
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
@@ -155,7 +152,6 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = {
                .sblk = &sc7280_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
-               .intr_rdptr = -1,
        },
 };
 
@@ -194,7 +190,6 @@ static const struct dpu_intf_cfg sc7280_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 = 0x35000, .len = 0x2c4,
@@ -214,7 +209,6 @@ static const struct dpu_intf_cfg sc7280_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,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
index 58f5e25679b15355f1f97f2b6ece886e277c96d9..1ccd1edd693c54748a6c474fedbe064e8e33907a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
@@ -221,7 +221,6 @@ static const struct dpu_pingpong_cfg sc8280xp_pp[] = {
                .sblk = &sc7280_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 = 0x6a000, .len = 0,
@@ -229,7 +228,6 @@ static const struct dpu_pingpong_cfg sc8280xp_pp[] = {
                .sblk = &sc7280_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 = 0x6b000, .len = 0,
@@ -237,7 +235,6 @@ static const struct dpu_pingpong_cfg sc8280xp_pp[] = {
                .sblk = &sc7280_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 = 0x6c000, .len = 0,
@@ -245,7 +242,6 @@ static const struct dpu_pingpong_cfg sc8280xp_pp[] = {
                .sblk = &sc7280_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 = 0x6d000, .len = 0,
@@ -253,7 +249,6 @@ static const struct dpu_pingpong_cfg sc8280xp_pp[] = {
                .sblk = &sc7280_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 = 0x6e000, .len = 0,
@@ -261,7 +256,6 @@ static const struct dpu_pingpong_cfg sc8280xp_pp[] = {
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
-               .intr_rdptr = -1,
        },
 };
 
@@ -328,7 +322,6 @@ static const struct dpu_intf_cfg sc8280xp_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 = 0x35000, .len = 0x300,
@@ -358,7 +351,6 @@ static const struct dpu_intf_cfg sc8280xp_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 = 0x38000, .len = 0x280,
@@ -368,7 +360,6 @@ static const struct dpu_intf_cfg sc8280xp_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 = 0x39000, .len = 0x280,
@@ -378,7 +369,6 @@ static const struct dpu_intf_cfg sc8280xp_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,
        }, {
                .name = "intf_6", .id = INTF_6,
                .base = 0x3a000, .len = 0x280,
@@ -388,7 +378,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] = {
                .prog_fetch_lines_worst_case = 24,
                .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 16),
                .intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 17),
-               .intr_tear_rd_ptr = -1,
        }, {
                .name = "intf_7", .id = INTF_7,
                .base = 0x3b000, .len = 0x280,
@@ -398,7 +387,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] = {
                .prog_fetch_lines_worst_case = 24,
                .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 18),
                .intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 19),
-               .intr_tear_rd_ptr = -1,
        }, {
                .name = "intf_8", .id = INTF_8,
                .base = 0x3c000, .len = 0x280,
@@ -408,7 +396,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] = {
                .prog_fetch_lines_worst_case = 24,
                .intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12),
                .intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13),
-               .intr_tear_rd_ptr = -1,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
index 1b12178dfbcab7f2a365d66fc4386df79886b59a..7742f52be859b49d1129064ae4c2dfc4e8c78520 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
@@ -221,7 +221,6 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
                .sblk = &sc7280_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 = 0x6a000, .len = 0,
@@ -229,7 +228,6 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
                .sblk = &sc7280_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 = 0x6b000, .len = 0,
@@ -237,7 +235,6 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
                .sblk = &sc7280_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 = 0x6c000, .len = 0,
@@ -245,7 +242,6 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
                .sblk = &sc7280_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 = 0x6d000, .len = 0,
@@ -253,7 +249,6 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
                .sblk = &sc7280_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 = 0x6e000, .len = 0,
@@ -261,23 +256,18 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
-               .intr_rdptr = -1,
        }, {
                .name = "pingpong_6", .id = PINGPONG_6,
                .base = 0x65800, .len = 0,
                .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
-               .intr_done = -1,
-               .intr_rdptr = -1,
        }, {
                .name = "pingpong_7", .id = PINGPONG_7,
                .base = 0x65c00, .len = 0,
                .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
-               .intr_done = -1,
-               .intr_rdptr = -1,
        },
 };
 
@@ -336,7 +326,6 @@ static const struct dpu_intf_cfg sm8450_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 = 0x35000, .len = 0x300,
@@ -366,7 +355,6 @@ static const struct dpu_intf_cfg sm8450_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,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
index 7bed819dfc390235953838649148135845667298..32d569bf9c20ca638d802d21e489ec443e450e2a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
@@ -236,7 +236,6 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
                .sblk = &sc7280_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 = 0x6a000, .len = 0,
@@ -244,7 +243,6 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
                .sblk = &sc7280_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 = 0x6b000, .len = 0,
@@ -252,7 +250,6 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
                .sblk = &sc7280_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 = 0x6c000, .len = 0,
@@ -260,7 +257,6 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
                .sblk = &sc7280_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 = 0x6d000, .len = 0,
@@ -268,7 +264,6 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
                .sblk = &sc7280_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 = 0x6e000, .len = 0,
@@ -276,23 +271,18 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
-               .intr_rdptr = -1,
        }, {
                .name = "pingpong_6", .id = PINGPONG_6,
                .base = 0x66000, .len = 0,
                .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
-               .intr_done = -1,
-               .intr_rdptr = -1,
        }, {
                .name = "pingpong_7", .id = PINGPONG_7,
                .base = 0x66400, .len = 0,
                .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
-               .intr_done = -1,
-               .intr_rdptr = -1,
        },
 };
 
@@ -351,7 +341,6 @@ static const struct dpu_intf_cfg sm8550_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 = 0x35000, .len = 0x300,
@@ -381,7 +370,6 @@ static const struct dpu_intf_cfg sm8550_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,
        },
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
index ba06312cbb163e82e5db8f8757e79dc942fc8cf9..7c286bafb948d1b797d1837074f27549f8f3dd06 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
@@ -37,7 +37,7 @@ irqreturn_t dpu_core_irq(struct msm_kms *kms);
  */
 u32 dpu_core_irq_read(
                struct dpu_kms *dpu_kms,
-               int irq_idx);
+               unsigned int irq_idx);
 
 /**
  * dpu_core_irq_register_callback - For registering callback function on IRQ
@@ -52,7 +52,7 @@ u32 dpu_core_irq_read(
  */
 int dpu_core_irq_register_callback(
                struct dpu_kms *dpu_kms,
-               int irq_idx,
+               unsigned int irq_idx,
                void (*irq_cb)(void *arg),
                void *irq_arg);
 
@@ -67,7 +67,7 @@ int dpu_core_irq_register_callback(
  */
 int dpu_core_irq_unregister_callback(
                struct dpu_kms *dpu_kms,
-               int irq_idx);
+               unsigned int irq_idx);
 
 /**
  * dpu_debugfs_core_irq_init - register core irq debugfs

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 7b1fc8099aa2dbb76d941a7652a0de331e1ab6c7..9cd4fa3a728cb6232b2bcee37d310622da7b529e 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -347,7 +347,7 @@ static int dpu_encoder_helper_wait_event_timeout(int32_t drm_id,
                u32 irq_idx, struct dpu_encoder_wait_info *info);
 
 int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,
-               int irq_idx,
+               unsigned int irq_idx,
                void (*func)(void *arg),
                struct dpu_encoder_wait_info *wait_info)
 {
@@ -1537,7 +1537,7 @@ void dpu_encoder_helper_trigger_start(struct dpu_encoder_phys *phys_enc)
 
 static int dpu_encoder_helper_wait_event_timeout(
                int32_t drm_id,
-               u32 irq_idx,
+               unsigned int irq_idx,
                struct dpu_encoder_wait_info *info)
 {
        int rc = 0;
@@ -2482,8 +2482,6 @@ unsigned int dpu_encoder_helper_get_dsc(struct dpu_encoder_phys *phys_enc)
 void dpu_encoder_phys_init(struct dpu_encoder_phys *phys_enc,
                          struct dpu_enc_phys_init_params *p)
 {
-       int i;
-
        phys_enc->hw_mdptop = p->dpu_kms->hw_mdp;
        phys_enc->hw_intf = p->hw_intf;
        phys_enc->hw_wb = p->hw_wb;
@@ -2493,9 +2491,6 @@ void dpu_encoder_phys_init(struct dpu_encoder_phys *phys_enc,
        phys_enc->enc_spinlock = p->enc_spinlock;
        phys_enc->enable_state = DPU_ENC_DISABLED;
 
-       for (i = 0; i < ARRAY_SIZE(phys_enc->irq); i++)
-               phys_enc->irq[i] = -EINVAL;
-
        atomic_set(&phys_enc->vblank_refcount, 0);
        atomic_set(&phys_enc->pending_kickoff_cnt, 0);
        atomic_set(&phys_enc->pending_ctlstart_cnt, 0);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
index f91661a6988824b9e8643f375de4ef901329df85..6f04c3d56e77c61408f890f29f2bf48630d76bff 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
@@ -193,7 +193,7 @@ struct dpu_encoder_phys {
        atomic_t pending_ctlstart_cnt;
        atomic_t pending_kickoff_cnt;
        wait_queue_head_t pending_kickoff_wq;
-       int irq[INTR_IDX_MAX];
+       unsigned int irq[INTR_IDX_MAX];
        bool has_intf_te;
 };
 
@@ -364,7 +364,7 @@ void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys *phys_enc,
  * @Return: 0 or -ERROR
  */
 int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,
-               int irq,
+               unsigned int irq,
                void (*func)(void *arg),
                struct dpu_encoder_wait_info *wait_info);
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
index 6c9634209e9fc7c19a928010bd91edc127ac888b..39a77777fa379827386cacdad1c49eca2dba7ab4 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -494,7 +494,7 @@ struct dpu_mdp_cfg {
  */
 struct dpu_ctl_cfg {
        DPU_HW_BLK_INFO;
-       s32 intr_start;
+       unsigned int intr_start;
 };
 
 /**
@@ -557,8 +557,8 @@ struct dpu_dspp_cfg  {
 struct dpu_pingpong_cfg  {
        DPU_HW_BLK_INFO;
        u32 merge_3d;
-       s32 intr_done;
-       s32 intr_rdptr;
+       unsigned int intr_done;
+       unsigned int intr_rdptr;
        const struct dpu_pingpong_sub_blks *sblk;
 };
 
@@ -605,9 +605,9 @@ struct dpu_intf_cfg  {
        u32 type;   /* interface type*/
        u32 controller_id;
        u32 prog_fetch_lines_worst_case;
-       s32 intr_underrun;
-       s32 intr_vsync;
-       s32 intr_tear_rd_ptr;
+       unsigned int intr_underrun;
+       unsigned int intr_vsync;
+       unsigned int intr_tear_rd_ptr;
 };
 
 /**
@@ -626,7 +626,7 @@ struct dpu_wb_cfg {
        u8 vbif_idx;
        u32 maxlinewidth;
        u32 xin_id;
-       s32 intr_wb_done;
+       unsigned int intr_wb_done;
        const u32 *format_list;
        u32 num_formats;
        enum dpu_clk_ctrl_type clk_ctrl;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
index f85558f257f34a62a2821c8f537a16592647f606..088807db2c83d93277acae21bf4ca170bff94392 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
@@ -199,15 +199,15 @@ static const struct dpu_intr_reg dpu_intr_set_7xxx[] = {
 
 #define DPU_IRQ_MASK(irq_idx)  (BIT(DPU_IRQ_BIT(irq_idx)))
 
-static inline bool dpu_core_irq_is_valid(int irq_idx)
+static inline bool dpu_core_irq_is_valid(unsigned int irq_idx)
 {
-       return irq_idx >= 0 && irq_idx < DPU_NUM_IRQS;
+       return irq_idx && irq_idx <= DPU_NUM_IRQS;
 }
 
 static inline struct dpu_hw_intr_entry *dpu_core_irq_get_entry(struct dpu_hw_intr *intr,
-                                                              int irq_idx)
+                                                              unsigned int irq_idx)
 {
-       return &intr->irq_tbl[irq_idx];
+       return &intr->irq_tbl[irq_idx - 1];
 }
 
 /**
@@ -215,7 +215,7 @@ static inline struct dpu_hw_intr_entry *dpu_core_irq_get_entry(struct dpu_hw_int
  * @dpu_kms:           Pointer to DPU's KMS structure
  * @irq_idx:           interrupt index
  */
-static void dpu_core_irq_callback_handler(struct dpu_kms *dpu_kms, int irq_idx)
+static void dpu_core_irq_callback_handler(struct dpu_kms *dpu_kms, unsigned int irq_idx)
 {
        struct dpu_hw_intr_entry *irq_entry = dpu_core_irq_get_entry(dpu_kms->hw_intr, irq_idx);
 
@@ -238,7 +238,7 @@ irqreturn_t dpu_core_irq(struct msm_kms *kms)
        struct dpu_kms *dpu_kms = to_dpu_kms(kms);
        struct dpu_hw_intr *intr = dpu_kms->hw_intr;
        int reg_idx;
-       int irq_idx;
+       unsigned int irq_idx;
        u32 irq_status;
        u32 enable_mask;
        int bit;
@@ -294,7 +294,8 @@ irqreturn_t dpu_core_irq(struct msm_kms *kms)
        return IRQ_HANDLED;
 }
 
-static int dpu_hw_intr_enable_irq_locked(struct dpu_hw_intr *intr, int irq_idx)
+static int dpu_hw_intr_enable_irq_locked(struct dpu_hw_intr *intr,
+                                        unsigned int irq_idx)
 {
        int reg_idx;
        const struct dpu_intr_reg *reg;
@@ -349,7 +350,8 @@ static int dpu_hw_intr_enable_irq_locked(struct dpu_hw_intr *intr, int irq_idx)
        return 0;
 }
 
-static int dpu_hw_intr_disable_irq_locked(struct dpu_hw_intr *intr, int irq_idx)
+static int dpu_hw_intr_disable_irq_locked(struct dpu_hw_intr *intr,
+                                         unsigned int irq_idx)
 {
        int reg_idx;
        const struct dpu_intr_reg *reg;
@@ -436,7 +438,8 @@ static void dpu_disable_all_irqs(struct dpu_kms *dpu_kms)
        wmb();
 }
 
-u32 dpu_core_irq_read(struct dpu_kms *dpu_kms, int irq_idx)
+u32 dpu_core_irq_read(struct dpu_kms *dpu_kms,
+                     unsigned int irq_idx)
 {
        struct dpu_hw_intr *intr = dpu_kms->hw_intr;
        int reg_idx;
@@ -500,7 +503,7 @@ struct dpu_hw_intr *dpu_hw_intr_init(void __iomem *addr,
 
                intr->irq_mask |= BIT(MDP_INTFn_INTR(intf->id));
 
-               if (intf->intr_tear_rd_ptr != -1)
+               if (intf->intr_tear_rd_ptr)
                        intr->irq_mask |= BIT(DPU_IRQ_REG(intf->intr_tear_rd_ptr));
        }
 
@@ -514,9 +517,10 @@ void dpu_hw_intr_destroy(struct dpu_hw_intr *intr)
        kfree(intr);
 }
 
-int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
-               void (*irq_cb)(void *arg),
-               void *irq_arg)
+int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms,
+                                  unsigned int irq_idx,
+                                  void (*irq_cb)(void *arg),
+                                  void *irq_arg)
 {
        struct dpu_hw_intr_entry *irq_entry;
        unsigned long irq_flags;
@@ -563,7 +567,8 @@ int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
        return 0;
 }
 
-int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms, int irq_idx)
+int dpu_core_irq_unregister_callback(struct dpu_kms *dpu_kms,
+                                    unsigned int irq_idx)
 {
        struct dpu_hw_intr_entry *irq_entry;
        unsigned long irq_flags;
@@ -606,7 +611,7 @@ static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v)
        int i, irq_count;
        void *cb;
 
-       for (i = 0; i < DPU_NUM_IRQS; i++) {
+       for (i = 1; i <= DPU_NUM_IRQS; i++) {
                spin_lock_irqsave(&dpu_kms->hw_intr->irq_lock, irq_flags);
                irq_entry = dpu_core_irq_get_entry(dpu_kms->hw_intr, i);
                irq_count = atomic_read(&irq_entry->count);
@@ -642,7 +647,7 @@ void dpu_core_irq_preinstall(struct msm_kms *kms)
        dpu_disable_all_irqs(dpu_kms);
        pm_runtime_put_sync(&dpu_kms->pdev->dev);
 
-       for (i = 0; i < DPU_NUM_IRQS; i++) {
+       for (i = 1; i <= DPU_NUM_IRQS; i++) {
                irq_entry = dpu_core_irq_get_entry(dpu_kms->hw_intr, i);
                atomic_set(&irq_entry->count, 0);
        }
@@ -658,7 +663,7 @@ void dpu_core_irq_uninstall(struct msm_kms *kms)
                return;
 
        pm_runtime_get_sync(&dpu_kms->pdev->dev);
-       for (i = 0; i < DPU_NUM_IRQS; i++) {
+       for (i = 1; i <= DPU_NUM_IRQS; i++) {
                irq_entry = dpu_core_irq_get_entry(dpu_kms->hw_intr, i);
                if (irq_entry->cb)
                        DPU_ERROR("IRQ=[%d, %d] still enabled/registered\n",

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h
index 9df5d6e737a116c9ea9247084569f3811418e565..53a21ebc57e8b960fad36e7d161fccfdd51baa20 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h
@@ -36,9 +36,9 @@ enum dpu_hw_intr_reg {
 
 #define MDP_INTFn_INTR(intf)   (MDP_INTF0_INTR + (intf - INTF_0))
 
-#define DPU_IRQ_IDX(reg_idx, offset)   (reg_idx * 32 + offset)
-#define DPU_IRQ_REG(irq_idx)   (irq_idx / 32)
-#define DPU_IRQ_BIT(irq_idx)   (irq_idx % 32)
+#define DPU_IRQ_IDX(reg_idx, offset)   (1 + reg_idx * 32 + offset)
+#define DPU_IRQ_REG(irq_idx)   ((irq_idx - 1) / 32)
+#define DPU_IRQ_BIT(irq_idx)   ((irq_idx - 1) % 32)
 
 #define DPU_NUM_IRQS           (MDP_INTR_MAX * 32)