drm/msm/dpu: drop TE2 definitions

Neither DPU driver nor vendor SDE driver do not use TE2 definitions
(and, in case of SDE driver, never did). Semantics of the TE2 feature
bit and .te2 sblk are not completely clear. Drop these bits from the
catalog with the possibility of reintroducing them later if we need to
support ppsplit.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/640305/
Link: https://lore.kernel.org/r/20250301-dpu-fix-catalog-v2-4-498271be8b50@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h
index ae18a354e5d2a3d2e073f2099e4d970bff5ed085..91f514d28ac62deeafa843b5fbd0c8eb856fa49e 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h
@@ -181,15 +181,15 @@ static const struct dpu_pingpong_cfg msm8996_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_MSM8996_TE2_MASK,
-               .sblk = &msm8996_pp_sblk_te,
+               .features = PINGPONG_MSM8996_MASK,
+               .sblk = &msm8996_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_MSM8996_TE2_MASK,
-               .sblk = &msm8996_pp_sblk_te,
+               .features = PINGPONG_MSM8996_MASK,
+               .sblk = &msm8996_pp_sblk,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
                .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13),
        }, {

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 746474679ef5b9ce7ef351e2d5434706d6109d33..413cd59dc0c4270973b34fc3a19405feff5b47e3 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,15 +170,15 @@ static const struct dpu_pingpong_cfg msm8998_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SDM845_TE2_MASK,
-               .sblk = &sdm845_pp_sblk_te,
+               .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_TE2_MASK,
-               .sblk = &sdm845_pp_sblk_te,
+               .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),
        }, {

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 bb89da0a481dec053e06369dee8b0854a3427aaf..b2eb7ca699e3ddacee441216be647784c9bbfcb5 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,15 +141,15 @@ static const struct dpu_pingpong_cfg sdm660_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SDM845_TE2_MASK,
-               .sblk = &sdm845_pp_sblk_te,
+               .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_TE2_MASK,
-               .sblk = &sdm845_pp_sblk_te,
+               .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),
        }, {

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 7caf876ca3e30cc9230cbc6f19b9d3d1b954e2e0..c9e485e11b5373efb576523a16a44b7eba046544 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,8 +115,8 @@ static const struct dpu_pingpong_cfg sdm630_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SDM845_TE2_MASK,
-               .sblk = &sdm845_pp_sblk_te,
+               .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),
        }, {

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 ab7b4822ca630f8258bc9eb52c0b967e9bc34d18..49363d7d5b9384dd66ed02ee9ada05b24355f1bf 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
@@ -194,15 +194,15 @@ static const struct dpu_pingpong_cfg sdm845_pp[] = {
        {
                .name = "pingpong_0", .id = PINGPONG_0,
                .base = 0x70000, .len = 0xd4,
-               .features = PINGPONG_SDM845_TE2_MASK,
-               .sblk = &sdm845_pp_sblk_te,
+               .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_TE2_MASK,
-               .sblk = &sdm845_pp_sblk_te,
+               .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),
        }, {

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 14cd588a56ee04aa664f5c88d3b9e4f1887369c4..338fdec761d4022f8727190ab1c1219165be6016 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -98,15 +98,9 @@
 #define PINGPONG_MSM8996_MASK \
        (BIT(DPU_PINGPONG_DSC))
 
-#define PINGPONG_MSM8996_TE2_MASK \
-       (PINGPONG_MSM8996_MASK | BIT(DPU_PINGPONG_TE2))
-
 #define PINGPONG_SDM845_MASK \
        (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC))
 
-#define PINGPONG_SDM845_TE2_MASK \
-       (PINGPONG_SDM845_MASK | BIT(DPU_PINGPONG_TE2))
-
 #define PINGPONG_SM8150_MASK \
        (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC))
 
@@ -434,22 +428,11 @@ static const struct dpu_dspp_sub_blks sdm845_dspp_sblk = {
 /*************************************************************
  * PINGPONG sub blocks config
  *************************************************************/
-static const struct dpu_pingpong_sub_blks msm8996_pp_sblk_te = {
-       .te2 = {.name = "te2", .base = 0x2000, .len = 0x0,
-               .version = 0x1},
-};
 
 static const struct dpu_pingpong_sub_blks msm8996_pp_sblk = {
        /* No dither block */
 };
 
-static const struct dpu_pingpong_sub_blks sdm845_pp_sblk_te = {
-       .te2 = {.name = "te2", .base = 0x2000, .len = 0x0,
-               .version = 0x1},
-       .dither = {.name = "dither", .base = 0x30e0,
-               .len = 0x20, .version = 0x10000},
-};
-
 static const struct dpu_pingpong_sub_blks sdm845_pp_sblk = {
        .dither = {.name = "dither", .base = 0x30e0,
                .len = 0x20, .version = 0x10000},

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 e9b627e02c8996c8fb611e8e333a35e7ce9b8373..01dd6e65f777f3b92f41e2ccb08f279650d50425 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -115,7 +115,6 @@ enum {
 
 /**
  * PINGPONG sub-blocks
- * @DPU_PINGPONG_TE2        Additional tear check block for split pipes
  * @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
@@ -123,8 +122,7 @@ enum {
  * @DPU_PINGPONG_MAX
  */
 enum {
-       DPU_PINGPONG_TE2 = 0x1,
-       DPU_PINGPONG_SPLIT,
+       DPU_PINGPONG_SPLIT = 0x1,
        DPU_PINGPONG_SLAVE,
        DPU_PINGPONG_DITHER,
        DPU_PINGPONG_DSC,
@@ -404,8 +402,6 @@ struct dpu_dspp_sub_blks {
 };
 
 struct dpu_pingpong_sub_blks {
-       struct dpu_pp_blk te;
-       struct dpu_pp_blk te2;
        struct dpu_pp_blk dither;
 };