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

lumag · Abhinav Kumar · commit af0a4a2090cc · 2025-02-15T11:46:42.000-08:00
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: 1f5bcc4 ("drm/msm/dpu: enable writeback on SC8108X") Fixes: ab2b03d ("drm/msm/dpu: enable writeback on SM6125") Fixes: 47cebb7 ("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
@@ -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
@@ -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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ static const struct dpu_wb_cfg sm8150_wb[] = {`
`297`	`297`	`{`
`298`	`298`	`.name = "wb_2", .id = WB_2,`
`299`	`299`	`.base = 0x65000, .len = 0x2c8,`
`300`		`- .features = WB_SDM845_MASK,`
	`300`	`+ .features = WB_SM8250_MASK,`
`301`	`301`	`.format_list = wb2_formats_rgb,`
`302`	`302`	`.num_formats = ARRAY_SIZE(wb2_formats_rgb),`
`303`	`303`	`.clk_ctrl = DPU_CLK_CTRL_WB2,`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ static const struct dpu_wb_cfg sc8180x_wb[] = {`
`304`	`304`	`{`
`305`	`305`	`.name = "wb_2", .id = WB_2,`
`306`	`306`	`.base = 0x65000, .len = 0x2c8,`
`307`		`- .features = WB_SDM845_MASK,`
	`307`	`+ .features = WB_SM8250_MASK,`
`308`	`308`	`.format_list = wb2_formats_rgb,`
`309`	`309`	`.num_formats = ARRAY_SIZE(wb2_formats_rgb),`
`310`	`310`	`.clk_ctrl = DPU_CLK_CTRL_WB2,`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ static const struct dpu_wb_cfg sm6125_wb[] = {`
`144`	`144`	`{`
`145`	`145`	`.name = "wb_2", .id = WB_2,`
`146`	`146`	`.base = 0x65000, .len = 0x2c8,`
`147`		`- .features = WB_SDM845_MASK,`
	`147`	`+ .features = WB_SM8250_MASK,`
`148`	`148`	`.format_list = wb2_formats_rgb,`
`149`	`149`	`.num_formats = ARRAY_SIZE(wb2_formats_rgb),`
`150`	`150`	`.clk_ctrl = DPU_CLK_CTRL_WB2,`