Skip to content

Commit ddfa00a

Browse files
lumagAbhinav Kumar
lumag
authored and
Abhinav Kumar
committed
drm/msm/dpu: drop rogue intr_tear_rd_ptr values
The commit 5a9d501 ("drm/msm/dpu: shift IRQ indices by 1") shifted IRQ indices by 1, making 'NO_IRQ' to be 0 rather than -1 (and allowing to skip the definition if the IRQ is not present). Several platform files were sketched before that commit, but got applied afterwards. As such, they inherited historical (and currently incorrect) setting of .intr_tear_rd_ptr = -1 for 'NO_IRQ' value. Drop that setting for all the affected platforms. Fixes: 62af6e1 ("drm/msm/dpu: Add support for MSM8917") Fixes: c079680 ("drm/msm/dpu: Add support for MSM8937") Fixes: 7a6109c ("drm/msm/dpu: Add support for MSM8953") Fixes: daf9a92 ("drm/msm/dpu: Add support for MSM8996") Fixes: 7204df5 ("drm/msm/dpu: add support for SDM660 and SDM630 platforms") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Patchwork: https://patchwork.freedesktop.org/patch/647486/ Link: https://lore.kernel.org/r/20250408-dpu-drop-intr-rd-ptr-v1-1-eeac337d88f8@oss.qualcomm.com Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
1 parent 2a34496 commit ddfa00a

File tree

6 files changed

+0
-15
lines changed

6 files changed

+0
-15
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ static const struct dpu_intf_cfg msm8937_intf[] = {
132132
.prog_fetch_lines_worst_case = 14,
133133
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),
134134
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),
135-
.intr_tear_rd_ptr = -1,
136135
}, {
137136
.name = "intf_2", .id = INTF_2,
138137
.base = 0x6b000, .len = 0x268,
@@ -141,7 +140,6 @@ static const struct dpu_intf_cfg msm8937_intf[] = {
141140
.prog_fetch_lines_worst_case = 14,
142141
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28),
143142
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29),
144-
.intr_tear_rd_ptr = -1,
145143
},
146144
};
147145

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ static const struct dpu_intf_cfg msm8917_intf[] = {
118118
.prog_fetch_lines_worst_case = 14,
119119
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),
120120
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),
121-
.intr_tear_rd_ptr = -1,
122121
},
123122
};
124123

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ static const struct dpu_intf_cfg msm8953_intf[] = {
131131
.prog_fetch_lines_worst_case = 14,
132132
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),
133133
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),
134-
.intr_tear_rd_ptr = -1,
135134
}, {
136135
.name = "intf_1", .id = INTF_1,
137136
.base = 0x6a800, .len = 0x268,
@@ -140,7 +139,6 @@ static const struct dpu_intf_cfg msm8953_intf[] = {
140139
.prog_fetch_lines_worst_case = 14,
141140
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),
142141
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),
143-
.intr_tear_rd_ptr = -1,
144142
}, {
145143
.name = "intf_2", .id = INTF_2,
146144
.base = 0x6b000, .len = 0x268,
@@ -149,7 +147,6 @@ static const struct dpu_intf_cfg msm8953_intf[] = {
149147
.prog_fetch_lines_worst_case = 14,
150148
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28),
151149
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29),
152-
.intr_tear_rd_ptr = -1,
153150
},
154151
};
155152

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ static const struct dpu_intf_cfg msm8996_intf[] = {
241241
.prog_fetch_lines_worst_case = 25,
242242
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),
243243
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),
244-
.intr_tear_rd_ptr = -1,
245244
}, {
246245
.name = "intf_1", .id = INTF_1,
247246
.base = 0x6a800, .len = 0x268,
@@ -250,7 +249,6 @@ static const struct dpu_intf_cfg msm8996_intf[] = {
250249
.prog_fetch_lines_worst_case = 25,
251250
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),
252251
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),
253-
.intr_tear_rd_ptr = -1,
254252
}, {
255253
.name = "intf_2", .id = INTF_2,
256254
.base = 0x6b000, .len = 0x268,
@@ -259,15 +257,13 @@ static const struct dpu_intf_cfg msm8996_intf[] = {
259257
.prog_fetch_lines_worst_case = 25,
260258
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28),
261259
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29),
262-
.intr_tear_rd_ptr = -1,
263260
}, {
264261
.name = "intf_3", .id = INTF_3,
265262
.base = 0x6b800, .len = 0x268,
266263
.type = INTF_HDMI,
267264
.prog_fetch_lines_worst_case = 25,
268265
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 30),
269266
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 31),
270-
.intr_tear_rd_ptr = -1,
271267
},
272268
};
273269

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ static const struct dpu_intf_cfg sdm660_intf[] = {
202202
.prog_fetch_lines_worst_case = 21,
203203
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),
204204
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),
205-
.intr_tear_rd_ptr = -1,
206205
}, {
207206
.name = "intf_1", .id = INTF_1,
208207
.base = 0x6a800, .len = 0x280,
@@ -211,7 +210,6 @@ static const struct dpu_intf_cfg sdm660_intf[] = {
211210
.prog_fetch_lines_worst_case = 21,
212211
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),
213212
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),
214-
.intr_tear_rd_ptr = -1,
215213
}, {
216214
.name = "intf_2", .id = INTF_2,
217215
.base = 0x6b000, .len = 0x280,
@@ -220,7 +218,6 @@ static const struct dpu_intf_cfg sdm660_intf[] = {
220218
.prog_fetch_lines_worst_case = 21,
221219
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 28),
222220
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 29),
223-
.intr_tear_rd_ptr = -1,
224221
},
225222
};
226223

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ static const struct dpu_intf_cfg sdm630_intf[] = {
147147
.prog_fetch_lines_worst_case = 21,
148148
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 24),
149149
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 25),
150-
.intr_tear_rd_ptr = -1,
151150
}, {
152151
.name = "intf_1", .id = INTF_1,
153152
.base = 0x6a800, .len = 0x280,
@@ -156,7 +155,6 @@ static const struct dpu_intf_cfg sdm630_intf[] = {
156155
.prog_fetch_lines_worst_case = 21,
157156
.intr_underrun = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 26),
158157
.intr_vsync = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 27),
159-
.intr_tear_rd_ptr = -1,
160158
},
161159
};
162160

0 commit comments

Comments
 (0)