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

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 4b748241fcfcd558b201eb8a3cf58e833fe30ac6..bcb39807fe61e231d6e318d8729ed86f213fb06a 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
@@ -254,25 +254,25 @@ static const struct dpu_pingpong_cfg sm8650_pp[] = {
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
-               .name = "pingpong_6", .id = PINGPONG_6,
+               .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_7", .id = PINGPONG_7,
+               .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_8", .id = PINGPONG_8,
+               .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_9", .id = PINGPONG_9,
+               .name = "pingpong_cwb_3", .id = PINGPONG_CWB_3,
                .base = 0x7e400, .len = 0,
                .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,

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 a1779c5597ae701496f21d3a8cb513189424a484..08742472f9cc812fbaf8f842ff7bd78f597e2b8d 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
@@ -257,13 +257,13 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
-               .name = "pingpong_6", .id = PINGPONG_6,
+               .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_7", .id = PINGPONG_7,
+               .name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
                .base = 0x65c00, .len = 0,
                .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,

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 907b4d7ceb470b0391d2bbbab3ce520efa2b3263..76ec72a323781363d37b62fec752ea1232bbd75b 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
@@ -256,13 +256,13 @@ static const struct dpu_pingpong_cfg sa8775p_pp[] = {
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
-               .name = "pingpong_6", .id = PINGPONG_6,
+               .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_7,
+               .name = "pingpong_7", .id = PINGPONG_CWB_1,
                .base = 0x65c00, .len = 0,
                .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,

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 a1dbbf5c652ff9f21c02af2e2520f019702f29c1..4d3787fceb72fb3641057a7ea04ae6503b671042 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
@@ -253,13 +253,13 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
-               .name = "pingpong_6", .id = PINGPONG_6,
+               .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_7", .id = PINGPONG_7,
+               .name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
                .base = 0x66400, .len = 0,
                .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,

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 4f110be6b750d30e158d517aaa507c7b4eda0af4..6b112e3d17da6a4423851525262b66aa6c8622e3 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
@@ -253,13 +253,13 @@ static const struct dpu_pingpong_cfg x1e80100_pp[] = {
                .merge_3d = MERGE_3D_2,
                .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
        }, {
-               .name = "pingpong_6", .id = PINGPONG_6,
+               .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_7", .id = PINGPONG_7,
+               .name = "pingpong_cwb_1", .id = PINGPONG_CWB_1,
                .base = 0x66400, .len = 0,
                .features = BIT(DPU_PINGPONG_DITHER),
                .sblk = &sc7280_pp_sblk,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
index f8806a4d317be0974c6ad5ad9f772c5029c1f8e1..fb3b6db8112f567f23ddab474d777182abb86033 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
@@ -181,10 +181,10 @@ enum dpu_pingpong {
        PINGPONG_3,
        PINGPONG_4,
        PINGPONG_5,
-       PINGPONG_6,
-       PINGPONG_7,
-       PINGPONG_8,
-       PINGPONG_9,
+       PINGPONG_CWB_0,
+       PINGPONG_CWB_1,
+       PINGPONG_CWB_2,
+       PINGPONG_CWB_3,
        PINGPONG_S0,
        PINGPONG_MAX
 };