drm/msm/dpu: get rid of DPU_PINGPONG_DITHER

Continue migration to the MDSS-revision based checks and replace
DPU_PINGPONG_DITHER feature bit with the core_major_ver >= 3 check.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/655393/
Link: https://lore.kernel.org/r/20250522-dpu-drop-features-v5-17-3b2085a07884@oss.qualcomm.com

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
index 88582fc..37c88b3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h
@@ -203,67 +203,57 @@ static const struct dpu_pingpong_cfg sm8650_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x69000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
        }, {
                .name = "pingpong_4", .id = PINGPONG_4,
                .base = 0x6d000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
        }, {
                .name = "pingpong_5", .id = PINGPONG_5,
                .base = 0x6e000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
                .name = "pingpong_cwb_0", .id = PINGPONG_CWB_0,
                .base = 0x66000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        }, {
                .name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
                .base = 0x66400, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        }, {
                .name = "pingpong_cwb_2", .id = PINGPONG_CWB_2,
                .base = 0x7e000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_4,
        }, {
                .name = "pingpong_cwb_3", .id = PINGPONG_CWB_3,
                .base = 0x7e400, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_4,
        },

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 9128551..f2ec308 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
@@ -170,28 +170,24 @@ static const struct dpu_pingpong_cfg msm8998_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SDM845_MASK,
                .sblk = &sdm845_pp_sblk,
                .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_MASK,
                .sblk = &sdm845_pp_sblk,
                .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),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h
index 50e0e3a..26f39ac 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h
@@ -141,28 +141,24 @@ static const struct dpu_pingpong_cfg sdm660_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SDM845_MASK,
                .sblk = &sdm845_pp_sblk,
                .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_MASK,
                .sblk = &sdm845_pp_sblk,
                .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),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h
index 1c29949..657f733 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h
@@ -115,14 +115,12 @@ static const struct dpu_pingpong_cfg sdm630_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sdm845_pp_sblk,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
                .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x71000, .len = 0xd4,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sdm845_pp_sblk,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
                .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14),

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 50e4040..15da5de 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
@@ -190,28 +190,24 @@ static const struct dpu_pingpong_cfg sdm845_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SDM845_MASK,
                .sblk = &sdm845_pp_sblk,
                .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_MASK,
                .sblk = &sdm845_pp_sblk,
                .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),

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 bcab869..e07c2cc 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
@@ -207,42 +207,36 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = {
        {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),

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 4b61bc7..b350dba 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
@@ -207,42 +207,36 @@ static const struct dpu_pingpong_cfg sc8180x_pp[] = {
        {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
index 2e7ae68..27c71a8 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h
@@ -156,28 +156,24 @@ static const struct dpu_pingpong_cfg sm7150_pp[] = {
        {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
index a99c99c..e2306d3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h
@@ -138,19 +138,16 @@ static const struct dpu_pingpong_cfg sm6150_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x70800, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x71000, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        },

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 72f1328..6213681 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
@@ -119,14 +119,12 @@ static const struct dpu_pingpong_cfg sm6125_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .merge_3d = 0,
                .sblk = &sdm845_pp_sblk,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x70800, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .merge_3d = 0,
                .sblk = &sdm845_pp_sblk,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

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 aee4adb..34f11fb 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
@@ -205,42 +205,36 @@ static const struct dpu_pingpong_cfg sm8250_pp[] = {
        {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),
        }, {
                .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),

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 05c0f81..135b4f8 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
@@ -111,14 +111,12 @@ static const struct dpu_pingpong_cfg sc7180_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x70800, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

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 b729a01..1189a5e 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
@@ -76,7 +76,6 @@ static const struct dpu_pingpong_cfg sm6115_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

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 25f56c5..13ff6bd 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
@@ -119,14 +119,12 @@ static struct dpu_pingpong_cfg sm6350_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x70800, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),

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 20b12a6..d4c2d2d 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
@@ -76,7 +76,6 @@ static const struct dpu_pingpong_cfg qcm2290_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

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 6935ff7..9135853 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
@@ -78,7 +78,6 @@ static const struct dpu_pingpong_cfg sm6375_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SM8150_MASK,
                .sblk = &sdm845_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),

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 b6b1a43..6503f11 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
@@ -205,42 +205,36 @@ static const struct dpu_pingpong_cfg sm8350_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x69000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
        }, {
                .name = "pingpong_4", .id = PINGPONG_4,
                .base = 0x6d000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
        }, {
                .name = "pingpong_5", .id = PINGPONG_5,
                .base = 0x6e000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

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 d1dd895..202de6f 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
@@ -121,28 +121,24 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x69000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = 0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),

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 481d36b..785ca2b 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
@@ -205,42 +205,36 @@ static const struct dpu_pingpong_cfg sc8280xp_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x69000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
        }, {
                .name = "pingpong_4", .id = PINGPONG_4,
                .base = 0x6d000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
        }, {
                .name = "pingpong_5", .id = PINGPONG_5,
                .base = 0x6e000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),

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 32649f2..1401a84 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
@@ -206,55 +206,47 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x69000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
        }, {
                .name = "pingpong_4", .id = PINGPONG_4,
                .base = 0x6d000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
        }, {
                .name = "pingpong_5", .id = PINGPONG_5,
                .base = 0x6e000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
                .name = "pingpong_cwb_0", .id = PINGPONG_CWB_0,
                .base = 0x65800, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        }, {
                .name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
                .base = 0x65c00, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        },

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h
index 4679b7e..fbbdce3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h
@@ -205,55 +205,47 @@ static const struct dpu_pingpong_cfg sa8775p_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x69000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
        }, {
                .name = "pingpong_4", .id = PINGPONG_4,
                .base = 0x6d000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
        }, {
                .name = "pingpong_5", .id = PINGPONG_5,
                .base = 0x6e000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
                .name = "pingpong_6", .id = PINGPONG_CWB_0,
                .base = 0x65800, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        }, {
                .name = "pingpong_7", .id = PINGPONG_CWB_1,
                .base = 0x65c00, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        },

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 def7c16..cc44134 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
@@ -202,55 +202,47 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x69000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
        }, {
                .name = "pingpong_4", .id = PINGPONG_4,
                .base = 0x6d000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
        }, {
                .name = "pingpong_5", .id = PINGPONG_5,
                .base = 0x6e000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
                .name = "pingpong_cwb_0", .id = PINGPONG_CWB_0,
                .base = 0x66000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        }, {
                .name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
                .base = 0x66400, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        },

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h
index 979a674..32f8853 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h
@@ -202,55 +202,47 @@ static const struct dpu_pingpong_cfg sar2130p_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x69000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
        }, {
                .name = "pingpong_4", .id = PINGPONG_4,
                .base = 0x6d000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
        }, {
                .name = "pingpong_5", .id = PINGPONG_5,
                .base = 0x6e000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
                .name = "pingpong_cwb_0", .id = PINGPONG_CWB_0,
                .base = 0x66000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        }, {
                .name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
                .base = 0x66400, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        },

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
index ffee074..e053324 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h
@@ -202,55 +202,47 @@ static const struct dpu_pingpong_cfg x1e80100_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x69000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
        }, {
                .name = "pingpong_1", .id = PINGPONG_1,
                .base = 0x6a000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_0,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
        }, {
                .name = "pingpong_2", .id = PINGPONG_2,
                .base = 0x6b000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
        }, {
                .name = "pingpong_3", .id = PINGPONG_3,
                .base = 0x6c000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_1,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
        }, {
                .name = "pingpong_4", .id = PINGPONG_4,
                .base = 0x6d000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
        }, {
                .name = "pingpong_5", .id = PINGPONG_5,
                .base = 0x6e000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
                .name = "pingpong_cwb_0", .id = PINGPONG_CWB_0,
                .base = 0x66000, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        }, {
                .name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
                .base = 0x66400, .len = 0,
-               .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,
                .merge_3d = MERGE_3D_3,
        },

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
index 75b679c..4777a4a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -95,12 +95,6 @@
 #define MIXER_QCM2290_MASK \
        (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA))
 
-#define PINGPONG_SDM845_MASK \
-       (BIT(DPU_PINGPONG_DITHER))
-
-#define PINGPONG_SM8150_MASK \
-       (BIT(DPU_PINGPONG_DITHER))
-
 #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \
                         BIT(DPU_WB_UBWC) | \
                         BIT(DPU_WB_YUV_CONFIG) | \

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 ac63f75..d48c26a 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -117,13 +117,11 @@ enum {
  * PINGPONG sub-blocks
  * @DPU_PINGPONG_SPLIT      PP block supports split fifo
  * @DPU_PINGPONG_SLAVE      PP block is a suitable slave for split fifo
- * @DPU_PINGPONG_DITHER     Dither blocks
  * @DPU_PINGPONG_MAX
  */
 enum {
        DPU_PINGPONG_SPLIT = 0x1,
        DPU_PINGPONG_SLAVE,
-       DPU_PINGPONG_DITHER,
        DPU_PINGPONG_MAX
 };
 

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
index 49e03ec..138071b 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
@@ -325,7 +325,7 @@ struct dpu_hw_pingpong *dpu_hw_pingpong_init(struct drm_device *dev,
                c->ops.disable_dsc = dpu_hw_pp_dsc_disable;
        }
 
-       if (test_bit(DPU_PINGPONG_DITHER, &cfg->features))
+       if (mdss_rev->core_major_ver >= 3)
                c->ops.setup_dither = dpu_hw_pp_setup_dither;
 
        return c;