Skip to content

Commit 69d0273

Browse files
Jessica Zhangrobclark
Jessica Zhang
authored and
robclark
committed
drm/msm/dpu: Support YUV formats on writeback for DPU 5.x+
Now that CDM_0 has been enabled for DPU 5.x+, add support for YUV formats on writeback Signed-off-by: Jessica Zhang <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/641270/ Signed-off-by: Rob Clark <[email protected]>
1 parent e79751f commit 69d0273

12 files changed

+24
-24
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ static const struct dpu_wb_cfg sm8650_wb[] = {
343343
.name = "wb_2", .id = WB_2,
344344
.base = 0x65000, .len = 0x2c8,
345345
.features = WB_SM8250_MASK,
346-
.format_list = wb2_formats_rgb,
347-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
346+
.format_list = wb2_formats_rgb_yuv,
347+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
348348
.xin_id = 6,
349349
.vbif_idx = VBIF_RT,
350350
.maxlinewidth = 4096,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ static const struct dpu_wb_cfg sm8150_wb[] = {
298298
.name = "wb_2", .id = WB_2,
299299
.base = 0x65000, .len = 0x2c8,
300300
.features = WB_SM8250_MASK,
301-
.format_list = wb2_formats_rgb,
302-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
301+
.format_list = wb2_formats_rgb_yuv,
302+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
303303
.clk_ctrl = DPU_CLK_CTRL_WB2,
304304
.xin_id = 6,
305305
.vbif_idx = VBIF_RT,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ static const struct dpu_wb_cfg sc8180x_wb[] = {
305305
.name = "wb_2", .id = WB_2,
306306
.base = 0x65000, .len = 0x2c8,
307307
.features = WB_SM8250_MASK,
308-
.format_list = wb2_formats_rgb,
309-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
308+
.format_list = wb2_formats_rgb_yuv,
309+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
310310
.clk_ctrl = DPU_CLK_CTRL_WB2,
311311
.xin_id = 6,
312312
.vbif_idx = VBIF_RT,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ static const struct dpu_wb_cfg sm7150_wb[] = {
261261
.name = "wb_2", .id = WB_2,
262262
.base = 0x65000, .len = 0x2c8,
263263
.features = WB_SM8250_MASK,
264-
.format_list = wb2_formats_rgb,
265-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
264+
.format_list = wb2_formats_rgb_yuv,
265+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
266266
.clk_ctrl = DPU_CLK_CTRL_WB2,
267267
.xin_id = 6,
268268
.vbif_idx = VBIF_RT,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ static const struct dpu_wb_cfg sm6150_wb[] = {
168168
.name = "wb_2", .id = WB_2,
169169
.base = 0x65000, .len = 0x2c8,
170170
.features = WB_SM8250_MASK,
171-
.format_list = wb2_formats_rgb,
172-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
171+
.format_list = wb2_formats_rgb_yuv,
172+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
173173
.clk_ctrl = DPU_CLK_CTRL_WB2,
174174
.xin_id = 6,
175175
.vbif_idx = VBIF_RT,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ static const struct dpu_wb_cfg sm6125_wb[] = {
145145
.name = "wb_2", .id = WB_2,
146146
.base = 0x65000, .len = 0x2c8,
147147
.features = WB_SM8250_MASK,
148-
.format_list = wb2_formats_rgb,
149-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
148+
.format_list = wb2_formats_rgb_yuv,
149+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
150150
.clk_ctrl = DPU_CLK_CTRL_WB2,
151151
.xin_id = 6,
152152
.vbif_idx = VBIF_RT,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ static const struct dpu_wb_cfg sc7180_wb[] = {
157157
.name = "wb_2", .id = WB_2,
158158
.base = 0x65000, .len = 0x2c8,
159159
.features = WB_SM8250_MASK,
160-
.format_list = wb2_formats_rgb,
161-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
160+
.format_list = wb2_formats_rgb_yuv,
161+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
162162
.clk_ctrl = DPU_CLK_CTRL_WB2,
163163
.xin_id = 6,
164164
.vbif_idx = VBIF_RT,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ static const struct dpu_wb_cfg sm6350_wb[] = {
151151
.name = "wb_2", .id = WB_2,
152152
.base = 0x65000, .len = 0x2c8,
153153
.features = WB_SM8250_MASK,
154-
.format_list = wb2_formats_rgb,
155-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
154+
.format_list = wb2_formats_rgb_yuv,
155+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
156156
.clk_ctrl = DPU_CLK_CTRL_WB2,
157157
.xin_id = 6,
158158
.vbif_idx = VBIF_RT,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ static const struct dpu_wb_cfg sm8350_wb[] = {
305305
.name = "wb_2", .id = WB_2,
306306
.base = 0x65000, .len = 0x2c8,
307307
.features = WB_SM8250_MASK,
308-
.format_list = wb2_formats_rgb,
309-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
308+
.format_list = wb2_formats_rgb_yuv,
309+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
310310
.clk_ctrl = DPU_CLK_CTRL_WB2,
311311
.xin_id = 6,
312312
.vbif_idx = VBIF_RT,

‎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
@@ -321,8 +321,8 @@ static const struct dpu_wb_cfg sm8450_wb[] = {
321321
.name = "wb_2", .id = WB_2,
322322
.base = 0x65000, .len = 0x2c8,
323323
.features = WB_SM8250_MASK,
324-
.format_list = wb2_formats_rgb,
325-
.num_formats = ARRAY_SIZE(wb2_formats_rgb),
324+
.format_list = wb2_formats_rgb_yuv,
325+
.num_formats = ARRAY_SIZE(wb2_formats_rgb_yuv),
326326
.clk_ctrl = DPU_CLK_CTRL_WB2,
327327
.xin_id = 6,
328328
.vbif_idx = VBIF_RT,

0 commit comments

Comments
 (0)