Skip to content

Commit cfbc21d

Browse files
MarijnS95Abhinav Kumar
MarijnS95
authored and
Abhinav Kumar
committed
drm/msm/dpu: Remove TE2 block and feature from DPU >= 5.0.0 hardware
No hardware beyond kona (sm8250, DPU 6.0.0) defines the TE2 PINGPONG sub-block offset downstream, and according to insiders no DPU >= 5.0.0 hardware has support for it either. Especially since neither downstream nor upstream utilize these registers in any way, remove the erroneous specification from SM8150, SC8180X, SM8250, SC7180, SM8350, SC8280XP and SM8450 to prevent confusion. Note that downstream enables the PPSPLIT (split-FIFO) topology (single LM for 2 PP and 2 INTF) based on the presence of a TE2 block. Fixes: 386fced ("drm/msm/dpu: add SM8150 to hw catalog") Fixes: 7bdc0c4 ("msm:disp:dpu1: add support for display for SC7180 target") Fixes: 0e91bcb ("drm/msm/dpu: Add SM8350 to hw catalog") Fixes: 4a352c2 ("drm/msm/dpu: Introduce SC8280XP") Fixes: 100d7ef ("drm/msm/dpu: add support for SM8450") Signed-off-by: Marijn Suijten <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/534210/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Abhinav Kumar <[email protected]>
1 parent f9d5bb7 commit cfbc21d

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ static const struct dpu_dspp_cfg sm8150_dspp[] = {
128128
};
129129

130130
static const struct dpu_pingpong_cfg sm8150_pp[] = {
131-
PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000, MERGE_3D_0, sdm845_pp_sblk_te,
131+
PP_BLK("pingpong_0", PINGPONG_0, 0x70000, MERGE_3D_0, sdm845_pp_sblk,
132132
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
133133
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
134-
PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800, MERGE_3D_0, sdm845_pp_sblk_te,
134+
PP_BLK("pingpong_1", PINGPONG_1, 0x70800, MERGE_3D_0, sdm845_pp_sblk,
135135
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
136136
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
137137
PP_BLK("pingpong_2", PINGPONG_2, 0x71000, MERGE_3D_1, sdm845_pp_sblk,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ static const struct dpu_lm_cfg sc8180x_lm[] = {
116116
};
117117

118118
static const struct dpu_pingpong_cfg sc8180x_pp[] = {
119-
PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000, MERGE_3D_0, sdm845_pp_sblk_te,
119+
PP_BLK("pingpong_0", PINGPONG_0, 0x70000, MERGE_3D_0, sdm845_pp_sblk,
120120
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
121121
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
122-
PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800, MERGE_3D_0, sdm845_pp_sblk_te,
122+
PP_BLK("pingpong_1", PINGPONG_1, 0x70800, MERGE_3D_0, sdm845_pp_sblk,
123123
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
124124
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
125125
PP_BLK("pingpong_2", PINGPONG_2, 0x71000, MERGE_3D_1, sdm845_pp_sblk,

‎drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ static const struct dpu_dspp_cfg sm8250_dspp[] = {
129129
};
130130

131131
static const struct dpu_pingpong_cfg sm8250_pp[] = {
132-
PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000, MERGE_3D_0, sdm845_pp_sblk_te,
132+
PP_BLK("pingpong_0", PINGPONG_0, 0x70000, MERGE_3D_0, sdm845_pp_sblk,
133133
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
134134
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
135-
PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800, MERGE_3D_0, sdm845_pp_sblk_te,
135+
PP_BLK("pingpong_1", PINGPONG_1, 0x70800, MERGE_3D_0, sdm845_pp_sblk,
136136
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
137137
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
138138
PP_BLK("pingpong_2", PINGPONG_2, 0x71000, MERGE_3D_1, sdm845_pp_sblk,

‎drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ static const struct dpu_dspp_cfg sc7180_dspp[] = {
8080
};
8181

8282
static const struct dpu_pingpong_cfg sc7180_pp[] = {
83-
PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk_te, -1, -1),
84-
PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800, 0, sdm845_pp_sblk_te, -1, -1),
83+
PP_BLK("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk, -1, -1),
84+
PP_BLK("pingpong_1", PINGPONG_1, 0x70800, 0, sdm845_pp_sblk, -1, -1),
8585
};
8686

8787
static const struct dpu_intf_cfg sc7180_intf[] = {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ static const struct dpu_dspp_cfg sm8350_dspp[] = {
127127
};
128128

129129
static const struct dpu_pingpong_cfg sm8350_pp[] = {
130-
PP_BLK_TE("pingpong_0", PINGPONG_0, 0x69000, MERGE_3D_0, sdm845_pp_sblk_te,
130+
PP_BLK("pingpong_0", PINGPONG_0, 0x69000, MERGE_3D_0, sdm845_pp_sblk,
131131
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
132132
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
133-
PP_BLK_TE("pingpong_1", PINGPONG_1, 0x6a000, MERGE_3D_0, sdm845_pp_sblk_te,
133+
PP_BLK("pingpong_1", PINGPONG_1, 0x6a000, MERGE_3D_0, sdm845_pp_sblk,
134134
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
135135
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
136136
PP_BLK("pingpong_2", PINGPONG_2, 0x6b000, MERGE_3D_1, sdm845_pp_sblk,

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,18 @@ static const struct dpu_dspp_cfg sc8280xp_dspp[] = {
121121
};
122122

123123
static const struct dpu_pingpong_cfg sc8280xp_pp[] = {
124-
PP_BLK_TE("pingpong_0", PINGPONG_0, 0x69000, MERGE_3D_0, sdm845_pp_sblk_te,
125-
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), -1),
126-
PP_BLK_TE("pingpong_1", PINGPONG_1, 0x6a000, MERGE_3D_0, sdm845_pp_sblk_te,
127-
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), -1),
128-
PP_BLK_TE("pingpong_2", PINGPONG_2, 0x6b000, MERGE_3D_1, sdm845_pp_sblk_te,
129-
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), -1),
130-
PP_BLK_TE("pingpong_3", PINGPONG_3, 0x6c000, MERGE_3D_1, sdm845_pp_sblk_te,
131-
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), -1),
132-
PP_BLK_TE("pingpong_4", PINGPONG_4, 0x6d000, MERGE_3D_2, sdm845_pp_sblk_te,
133-
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), -1),
134-
PP_BLK_TE("pingpong_5", PINGPONG_5, 0x6e000, MERGE_3D_2, sdm845_pp_sblk_te,
135-
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), -1),
124+
PP_BLK("pingpong_0", PINGPONG_0, 0x69000, MERGE_3D_0, sdm845_pp_sblk,
125+
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), -1),
126+
PP_BLK("pingpong_1", PINGPONG_1, 0x6a000, MERGE_3D_0, sdm845_pp_sblk,
127+
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), -1),
128+
PP_BLK("pingpong_2", PINGPONG_2, 0x6b000, MERGE_3D_1, sdm845_pp_sblk,
129+
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), -1),
130+
PP_BLK("pingpong_3", PINGPONG_3, 0x6c000, MERGE_3D_1, sdm845_pp_sblk,
131+
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), -1),
132+
PP_BLK("pingpong_4", PINGPONG_4, 0x6d000, MERGE_3D_2, sdm845_pp_sblk,
133+
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), -1),
134+
PP_BLK("pingpong_5", PINGPONG_5, 0x6e000, MERGE_3D_2, sdm845_pp_sblk,
135+
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), -1),
136136
};
137137

138138
static const struct dpu_merge_3d_cfg sc8280xp_merge_3d[] = {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ static const struct dpu_dspp_cfg sm8450_dspp[] = {
128128
};
129129
/* FIXME: interrupts */
130130
static const struct dpu_pingpong_cfg sm8450_pp[] = {
131-
PP_BLK_TE("pingpong_0", PINGPONG_0, 0x69000, MERGE_3D_0, sdm845_pp_sblk_te,
131+
PP_BLK("pingpong_0", PINGPONG_0, 0x69000, MERGE_3D_0, sdm845_pp_sblk,
132132
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
133133
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
134-
PP_BLK_TE("pingpong_1", PINGPONG_1, 0x6a000, MERGE_3D_0, sdm845_pp_sblk_te,
134+
PP_BLK("pingpong_1", PINGPONG_1, 0x6a000, MERGE_3D_0, sdm845_pp_sblk,
135135
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
136136
DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
137137
PP_BLK("pingpong_2", PINGPONG_2, 0x6b000, MERGE_3D_1, sdm845_pp_sblk,

0 commit comments

Comments
 (0)