Skip to content

Commit d1fe88d

Browse files
Jessica Zhanglumag
Jessica Zhang
authored and
lumag
committed
drm/msm/dpu: Specify dedicated CWB pingpong blocks
Change pingpong index and names to distinguish between general use pingpong blocks and pingpong blocks dedicated for concurrent writeback Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/629229/ Link: https://lore.kernel.org/r/20241216-concurrent-wb-v4-10-fe220297a7f0@quicinc.com
1 parent 989412e commit d1fe88d

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,25 +254,25 @@ static const struct dpu_pingpong_cfg sm8650_pp[] = {
254254
.merge_3d = MERGE_3D_2,
255255
.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
256256
}, {
257-
.name = "pingpong_6", .id = PINGPONG_6,
257+
.name = "pingpong_cwb_0", .id = PINGPONG_CWB_0,
258258
.base = 0x66000, .len = 0,
259259
.features = BIT(DPU_PINGPONG_DITHER),
260260
.sblk = &sc7280_pp_sblk,
261261
.merge_3d = MERGE_3D_3,
262262
}, {
263-
.name = "pingpong_7", .id = PINGPONG_7,
263+
.name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
264264
.base = 0x66400, .len = 0,
265265
.features = BIT(DPU_PINGPONG_DITHER),
266266
.sblk = &sc7280_pp_sblk,
267267
.merge_3d = MERGE_3D_3,
268268
}, {
269-
.name = "pingpong_8", .id = PINGPONG_8,
269+
.name = "pingpong_cwb_2", .id = PINGPONG_CWB_2,
270270
.base = 0x7e000, .len = 0,
271271
.features = BIT(DPU_PINGPONG_DITHER),
272272
.sblk = &sc7280_pp_sblk,
273273
.merge_3d = MERGE_3D_4,
274274
}, {
275-
.name = "pingpong_9", .id = PINGPONG_9,
275+
.name = "pingpong_cwb_3", .id = PINGPONG_CWB_3,
276276
.base = 0x7e400, .len = 0,
277277
.features = BIT(DPU_PINGPONG_DITHER),
278278
.sblk = &sc7280_pp_sblk,

‎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
@@ -257,13 +257,13 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
257257
.merge_3d = MERGE_3D_2,
258258
.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
259259
}, {
260-
.name = "pingpong_6", .id = PINGPONG_6,
260+
.name = "pingpong_cwb_0", .id = PINGPONG_CWB_0,
261261
.base = 0x65800, .len = 0,
262262
.features = BIT(DPU_PINGPONG_DITHER),
263263
.sblk = &sc7280_pp_sblk,
264264
.merge_3d = MERGE_3D_3,
265265
}, {
266-
.name = "pingpong_7", .id = PINGPONG_7,
266+
.name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
267267
.base = 0x65c00, .len = 0,
268268
.features = BIT(DPU_PINGPONG_DITHER),
269269
.sblk = &sc7280_pp_sblk,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,13 @@ static const struct dpu_pingpong_cfg sa8775p_pp[] = {
256256
.merge_3d = MERGE_3D_2,
257257
.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
258258
}, {
259-
.name = "pingpong_6", .id = PINGPONG_6,
259+
.name = "pingpong_6", .id = PINGPONG_CWB_0,
260260
.base = 0x65800, .len = 0,
261261
.features = BIT(DPU_PINGPONG_DITHER),
262262
.sblk = &sc7280_pp_sblk,
263263
.merge_3d = MERGE_3D_3,
264264
}, {
265-
.name = "pingpong_7", .id = PINGPONG_7,
265+
.name = "pingpong_7", .id = PINGPONG_CWB_1,
266266
.base = 0x65c00, .len = 0,
267267
.features = BIT(DPU_PINGPONG_DITHER),
268268
.sblk = &sc7280_pp_sblk,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,13 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
253253
.merge_3d = MERGE_3D_2,
254254
.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
255255
}, {
256-
.name = "pingpong_6", .id = PINGPONG_6,
256+
.name = "pingpong_cwb_0", .id = PINGPONG_CWB_0,
257257
.base = 0x66000, .len = 0,
258258
.features = BIT(DPU_PINGPONG_DITHER),
259259
.sblk = &sc7280_pp_sblk,
260260
.merge_3d = MERGE_3D_3,
261261
}, {
262-
.name = "pingpong_7", .id = PINGPONG_7,
262+
.name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
263263
.base = 0x66400, .len = 0,
264264
.features = BIT(DPU_PINGPONG_DITHER),
265265
.sblk = &sc7280_pp_sblk,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,13 @@ static const struct dpu_pingpong_cfg x1e80100_pp[] = {
253253
.merge_3d = MERGE_3D_2,
254254
.intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
255255
}, {
256-
.name = "pingpong_6", .id = PINGPONG_6,
256+
.name = "pingpong_cwb_0", .id = PINGPONG_CWB_0,
257257
.base = 0x66000, .len = 0,
258258
.features = BIT(DPU_PINGPONG_DITHER),
259259
.sblk = &sc7280_pp_sblk,
260260
.merge_3d = MERGE_3D_3,
261261
}, {
262-
.name = "pingpong_7", .id = PINGPONG_7,
262+
.name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
263263
.base = 0x66400, .len = 0,
264264
.features = BIT(DPU_PINGPONG_DITHER),
265265
.sblk = &sc7280_pp_sblk,

‎drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ enum dpu_pingpong {
181181
PINGPONG_3,
182182
PINGPONG_4,
183183
PINGPONG_5,
184-
PINGPONG_6,
185-
PINGPONG_7,
186-
PINGPONG_8,
187-
PINGPONG_9,
184+
PINGPONG_CWB_0,
185+
PINGPONG_CWB_1,
186+
PINGPONG_CWB_2,
187+
PINGPONG_CWB_3,
188188
PINGPONG_S0,
189189
PINGPONG_MAX
190190
};

0 commit comments

Comments
 (0)