Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/msm/dpu: drop virt_formats from SSPP subblock configuration
The virt_formats / virt_num_formats are not used by the current driver
and are not going to be used in future since formats for virtual planes
are handled in a different way, by forbidding unsupported combinations
during atomic_check. Drop those fields now.
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/621479/
Link: https://lore.kernel.org/r/20241025-dpu-virtual-wide-v6-3-0310fd519765@linaro.org
-16
-12
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
-12
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
···
317
317
.base = 0x1a00, .len = 0x100,}, \
318
318
.format_list = plane_formats_yuv, \
319
319
.num_formats = ARRAY_SIZE(plane_formats_yuv), \
320
-
.virt_format_list = plane_formats, \
321
-
.virt_num_formats = ARRAY_SIZE(plane_formats), \
322
320
.rotation_cfg = NULL, \
323
321
}
324
322
···
331
333
.base = 0x1a00, .len = 0x100,}, \
332
334
.format_list = plane_formats_yuv, \
333
335
.num_formats = ARRAY_SIZE(plane_formats_yuv), \
334
-
.virt_format_list = plane_formats, \
335
-
.virt_num_formats = ARRAY_SIZE(plane_formats), \
336
336
.rotation_cfg = rot_cfg, \
337
337
}
338
338
···
340
344
.maxupscale = SSPP_UNITY_SCALE, \
341
345
.format_list = plane_formats, \
342
346
.num_formats = ARRAY_SIZE(plane_formats), \
343
-
.virt_format_list = plane_formats, \
344
-
.virt_num_formats = ARRAY_SIZE(plane_formats), \
345
347
}
346
348
347
349
/* qseed2 is not supported, so disabled scaling */
···
354
360
.base = 0x320, .len = 0x100,}, \
355
361
.format_list = plane_formats_yuv, \
356
362
.num_formats = ARRAY_SIZE(plane_formats_yuv), \
357
-
.virt_format_list = plane_formats, \
358
-
.virt_num_formats = ARRAY_SIZE(plane_formats), \
359
363
.rotation_cfg = NULL, \
360
364
}
361
365
···
365
373
.base = 0x200, .len = 0x28,}, \
366
374
.format_list = plane_formats, \
367
375
.num_formats = ARRAY_SIZE(plane_formats), \
368
-
.virt_format_list = plane_formats, \
369
-
.virt_num_formats = ARRAY_SIZE(plane_formats), \
370
376
}
371
377
372
378
#define _DMA_SBLK() \
···
373
383
.maxupscale = SSPP_UNITY_SCALE, \
374
384
.format_list = plane_formats, \
375
385
.num_formats = ARRAY_SIZE(plane_formats), \
376
-
.virt_format_list = plane_formats, \
377
-
.virt_num_formats = ARRAY_SIZE(plane_formats), \
378
386
}
379
387
380
388
static const struct dpu_rotation_cfg dpu_rot_sc7280_cfg_v2 = {
-4
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
-4
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
···
372
372
* @csc_blk:
373
373
* @format_list: Pointer to list of supported formats
374
374
* @num_formats: Number of supported formats
375
-
* @virt_format_list: Pointer to list of supported formats for virtual planes
376
-
* @virt_num_formats: Number of supported formats for virtual planes
377
375
* @dpu_rotation_cfg: inline rotation configuration
378
376
*/
379
377
struct dpu_sspp_sub_blks {
···
384
386
385
387
const u32 *format_list;
386
388
u32 num_formats;
387
-
const u32 *virt_format_list;
388
-
u32 virt_num_formats;
389
389
const struct dpu_rotation_cfg *rotation_cfg;
390
390
};
391
391