File tree Expand file tree Collapse file tree 8 files changed +50
-15
lines changed
drivers/gpu/drm/msm/disp/dpu1 Expand file tree Collapse file tree 8 files changed +50
-15
lines changed Original file line number Diff line number Diff line change @@ -341,8 +341,8 @@ static const struct dpu_wb_cfg sm8650_wb[] = {
341
341
.name = "wb_2" , .id = WB_2 ,
342
342
.base = 0x65000 , .len = 0x2c8 ,
343
343
.features = WB_SM8250_MASK ,
344
- .format_list = wb2_formats ,
345
- .num_formats = ARRAY_SIZE (wb2_formats ),
344
+ .format_list = wb2_formats_rgb ,
345
+ .num_formats = ARRAY_SIZE (wb2_formats_rgb ),
346
346
.xin_id = 6 ,
347
347
.vbif_idx = VBIF_RT ,
348
348
.maxlinewidth = 4096 ,
Original file line number Diff line number Diff line change @@ -336,8 +336,8 @@ static const struct dpu_wb_cfg sm8250_wb[] = {
336
336
.name = "wb_2" , .id = WB_2 ,
337
337
.base = 0x65000 , .len = 0x2c8 ,
338
338
.features = WB_SM8250_MASK ,
339
- .format_list = wb2_formats ,
340
- .num_formats = ARRAY_SIZE (wb2_formats ),
339
+ .format_list = wb2_formats_rgb_yuv ,
340
+ .num_formats = ARRAY_SIZE (wb2_formats_rgb_yuv ),
341
341
.clk_ctrl = DPU_CLK_CTRL_WB2 ,
342
342
.xin_id = 6 ,
343
343
.vbif_idx = VBIF_RT ,
Original file line number Diff line number Diff line change @@ -157,8 +157,8 @@ static const struct dpu_wb_cfg sc7180_wb[] = {
157
157
.name = "wb_2" , .id = WB_2 ,
158
158
.base = 0x65000 , .len = 0x2c8 ,
159
159
.features = WB_SM8250_MASK ,
160
- .format_list = wb2_formats ,
161
- .num_formats = ARRAY_SIZE (wb2_formats ),
160
+ .format_list = wb2_formats_rgb ,
161
+ .num_formats = ARRAY_SIZE (wb2_formats_rgb ),
162
162
.clk_ctrl = DPU_CLK_CTRL_WB2 ,
163
163
.xin_id = 6 ,
164
164
.vbif_idx = VBIF_RT ,
Original file line number Diff line number Diff line change @@ -303,8 +303,8 @@ static const struct dpu_wb_cfg sm8350_wb[] = {
303
303
.name = "wb_2" , .id = WB_2 ,
304
304
.base = 0x65000 , .len = 0x2c8 ,
305
305
.features = WB_SM8250_MASK ,
306
- .format_list = wb2_formats ,
307
- .num_formats = ARRAY_SIZE (wb2_formats ),
306
+ .format_list = wb2_formats_rgb ,
307
+ .num_formats = ARRAY_SIZE (wb2_formats_rgb ),
308
308
.clk_ctrl = DPU_CLK_CTRL_WB2 ,
309
309
.xin_id = 6 ,
310
310
.vbif_idx = VBIF_RT ,
Original file line number Diff line number Diff line change @@ -169,8 +169,8 @@ static const struct dpu_wb_cfg sc7280_wb[] = {
169
169
.name = "wb_2" , .id = WB_2 ,
170
170
.base = 0x65000 , .len = 0x2c8 ,
171
171
.features = WB_SM8250_MASK ,
172
- .format_list = wb2_formats ,
173
- .num_formats = ARRAY_SIZE (wb2_formats ),
172
+ .format_list = wb2_formats_rgb_yuv ,
173
+ .num_formats = ARRAY_SIZE (wb2_formats_rgb_yuv ),
174
174
.clk_ctrl = DPU_CLK_CTRL_WB2 ,
175
175
.xin_id = 6 ,
176
176
.vbif_idx = VBIF_RT ,
Original file line number Diff line number Diff line change @@ -321,8 +321,8 @@ static const struct dpu_wb_cfg sm8450_wb[] = {
321
321
.name = "wb_2" , .id = WB_2 ,
322
322
.base = 0x65000 , .len = 0x2c8 ,
323
323
.features = WB_SM8250_MASK ,
324
- .format_list = wb2_formats ,
325
- .num_formats = ARRAY_SIZE (wb2_formats ),
324
+ .format_list = wb2_formats_rgb ,
325
+ .num_formats = ARRAY_SIZE (wb2_formats_rgb ),
326
326
.clk_ctrl = DPU_CLK_CTRL_WB2 ,
327
327
.xin_id = 6 ,
328
328
.vbif_idx = VBIF_RT ,
Original file line number Diff line number Diff line change @@ -315,8 +315,8 @@ static const struct dpu_wb_cfg sm8550_wb[] = {
315
315
.name = "wb_2" , .id = WB_2 ,
316
316
.base = 0x65000 , .len = 0x2c8 ,
317
317
.features = WB_SM8250_MASK ,
318
- .format_list = wb2_formats ,
319
- .num_formats = ARRAY_SIZE (wb2_formats ),
318
+ .format_list = wb2_formats_rgb ,
319
+ .num_formats = ARRAY_SIZE (wb2_formats_rgb ),
320
320
.xin_id = 6 ,
321
321
.vbif_idx = VBIF_RT ,
322
322
.maxlinewidth = 4096 ,
Original file line number Diff line number Diff line change @@ -202,7 +202,7 @@ static const u32 rotation_v2_formats[] = {
202
202
/* TODO add formats after validation */
203
203
};
204
204
205
- static const uint32_t wb2_formats [] = {
205
+ static const u32 wb2_formats_rgb [] = {
206
206
DRM_FORMAT_RGB565 ,
207
207
DRM_FORMAT_BGR565 ,
208
208
DRM_FORMAT_RGB888 ,
@@ -236,6 +236,41 @@ static const uint32_t wb2_formats[] = {
236
236
DRM_FORMAT_XBGR4444 ,
237
237
};
238
238
239
+ static const u32 wb2_formats_rgb_yuv [] = {
240
+ DRM_FORMAT_RGB565 ,
241
+ DRM_FORMAT_BGR565 ,
242
+ DRM_FORMAT_RGB888 ,
243
+ DRM_FORMAT_ARGB8888 ,
244
+ DRM_FORMAT_RGBA8888 ,
245
+ DRM_FORMAT_ABGR8888 ,
246
+ DRM_FORMAT_XRGB8888 ,
247
+ DRM_FORMAT_RGBX8888 ,
248
+ DRM_FORMAT_XBGR8888 ,
249
+ DRM_FORMAT_ARGB1555 ,
250
+ DRM_FORMAT_RGBA5551 ,
251
+ DRM_FORMAT_XRGB1555 ,
252
+ DRM_FORMAT_RGBX5551 ,
253
+ DRM_FORMAT_ARGB4444 ,
254
+ DRM_FORMAT_RGBA4444 ,
255
+ DRM_FORMAT_RGBX4444 ,
256
+ DRM_FORMAT_XRGB4444 ,
257
+ DRM_FORMAT_BGR565 ,
258
+ DRM_FORMAT_BGR888 ,
259
+ DRM_FORMAT_ABGR8888 ,
260
+ DRM_FORMAT_BGRA8888 ,
261
+ DRM_FORMAT_BGRX8888 ,
262
+ DRM_FORMAT_XBGR8888 ,
263
+ DRM_FORMAT_ABGR1555 ,
264
+ DRM_FORMAT_BGRA5551 ,
265
+ DRM_FORMAT_XBGR1555 ,
266
+ DRM_FORMAT_BGRX5551 ,
267
+ DRM_FORMAT_ABGR4444 ,
268
+ DRM_FORMAT_BGRA4444 ,
269
+ DRM_FORMAT_BGRX4444 ,
270
+ DRM_FORMAT_XBGR4444 ,
271
+ DRM_FORMAT_NV12 ,
272
+ };
273
+
239
274
/*************************************************************
240
275
* SSPP sub blocks config
241
276
*************************************************************/
You can’t perform that action at this time.
0 commit comments