drm/msm/dpu: enable DPU_WB_INPUT_CTRL for DPU 5.x

Several DPU 5.x platforms are supposed to be using DPU_WB_INPUT_CTRL,
to bind WB and PINGPONG blocks, but they do not. Change those platforms
to use WB_SM8250_MASK, which includes that bit.

Fixes: 1f5bcc4316b3 ("drm/msm/dpu: enable writeback on SC8108X")
Fixes: ab2b03d73a66 ("drm/msm/dpu: enable writeback on SM6125")
Fixes: 47cebb740a83 ("drm/msm/dpu: enable writeback on SM8150")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/628876/
Link: https://lore.kernel.org/r/20241214-dpu-drop-features-v1-2-988f0662cb7e@linaro.org
Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
index 421afacb7248039abd9fb66bcb73b756ae0d640a..36cc9dbc00b5c1219e1aa557dd4ee0e801b5c9e7 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
@@ -297,7 +297,7 @@ static const struct dpu_wb_cfg sm8150_wb[] = {
        {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
-               .features = WB_SDM845_MASK,
+               .features = WB_SM8250_MASK,
                .format_list = wb2_formats_rgb,
                .num_formats = ARRAY_SIZE(wb2_formats_rgb),
                .clk_ctrl = DPU_CLK_CTRL_WB2,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
index 641023b102bf59352546f0782d9264986367de78..e8eacdb47967a227567a96a85a93a69befbb00d5 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
@@ -304,7 +304,7 @@ static const struct dpu_wb_cfg sc8180x_wb[] = {
        {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
-               .features = WB_SDM845_MASK,
+               .features = WB_SM8250_MASK,
                .format_list = wb2_formats_rgb,
                .num_formats = ARRAY_SIZE(wb2_formats_rgb),
                .clk_ctrl = DPU_CLK_CTRL_WB2,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
index d039b96beb97cfeda629ef2546902f7281c53543..76f60a2df7a890c5346fe248d67d646ade574fe4 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
@@ -144,7 +144,7 @@ static const struct dpu_wb_cfg sm6125_wb[] = {
        {
                .name = "wb_2", .id = WB_2,
                .base = 0x65000, .len = 0x2c8,
-               .features = WB_SDM845_MASK,
+               .features = WB_SM8250_MASK,
                .format_list = wb2_formats_rgb,
                .num_formats = ARRAY_SIZE(wb2_formats_rgb),
                .clk_ctrl = DPU_CLK_CTRL_WB2,