github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: platform: rzg2l-cru: Use v4l2_fill_pixfmt()

Browse Source 
Rather than open-code a calculation of the format's bytesperline
and sizeimage, use the v4l2_fill_pixfmt() helper. This makes it
easier to support the CRU packed pixel formats without over
complicating the driver.

This change makes the .bpp member of struct rzg2l_cru_ip_format
superfluous - remove them.

Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: Daniel Scally <dan.scally+renesas@ideasonboard.com>
Link: https://lore.kernel.org/r/20250625-rzg2l-cru-v6-4-a9099ed26c14@ideasonboard.com
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
Daniel Scally 2025-06-25 10:20:30 +01:00 committed by Hans Verkuil
parent ac261abe73
commit ace92ccef0
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h
View File

@ -68,7 +68,6 @@ struct rzg2l_cru_ip {
* @datatype: MIPI CSI2 data type * @datatype: MIPI CSI2 data type
* @format: 4CC format identifier (V4L2_PIX_FMT_*) * @format: 4CC format identifier (V4L2_PIX_FMT_*)
* @icndmr: ICnDMR register value * @icndmr: ICnDMR register value
* @bpp: bytes per pixel
* @yuv: Flag to indicate whether the format is YUV-based. * @yuv: Flag to indicate whether the format is YUV-based.
*/ */
struct rzg2l_cru_ip_format { struct rzg2l_cru_ip_format {
@ -76,7 +75,6 @@ struct rzg2l_cru_ip_format {
u32 datatype; u32 datatype;
u32 format; u32 format;
u32 icndmr; u32 icndmr;
u8 bpp;
bool yuv; bool yuv;
}; };

5
drivers/media/platform/renesas/rzg2l-cru/rzg2l-ip.c
View File

@ -16,7 +16,6 @@ static const struct rzg2l_cru_ip_format rzg2l_cru_ip_formats[] = {
.code = MEDIA_BUS_FMT_UYVY8_1X16, .code = MEDIA_BUS_FMT_UYVY8_1X16,
.datatype = MIPI_CSI2_DT_YUV422_8B, .datatype = MIPI_CSI2_DT_YUV422_8B,
.format = V4L2_PIX_FMT_UYVY, .format = V4L2_PIX_FMT_UYVY,
.bpp = 2,
.icndmr = ICnDMR_YCMODE_UYVY, .icndmr = ICnDMR_YCMODE_UYVY,
.yuv = true, .yuv = true,
}, },
@ -24,7 +23,6 @@ static const struct rzg2l_cru_ip_format rzg2l_cru_ip_formats[] = {
.code = MEDIA_BUS_FMT_SBGGR8_1X8, .code = MEDIA_BUS_FMT_SBGGR8_1X8,
.format = V4L2_PIX_FMT_SBGGR8, .format = V4L2_PIX_FMT_SBGGR8,
.datatype = MIPI_CSI2_DT_RAW8, .datatype = MIPI_CSI2_DT_RAW8,
.bpp = 1,
.icndmr = 0, .icndmr = 0,
.yuv = false, .yuv = false,
}, },
@ -32,7 +30,6 @@ static const struct rzg2l_cru_ip_format rzg2l_cru_ip_formats[] = {
.code = MEDIA_BUS_FMT_SGBRG8_1X8, .code = MEDIA_BUS_FMT_SGBRG8_1X8,
.format = V4L2_PIX_FMT_SGBRG8, .format = V4L2_PIX_FMT_SGBRG8,
.datatype = MIPI_CSI2_DT_RAW8, .datatype = MIPI_CSI2_DT_RAW8,
.bpp = 1,
.icndmr = 0, .icndmr = 0,
.yuv = false, .yuv = false,
}, },
@ -40,7 +37,6 @@ static const struct rzg2l_cru_ip_format rzg2l_cru_ip_formats[] = {
.code = MEDIA_BUS_FMT_SGRBG8_1X8, .code = MEDIA_BUS_FMT_SGRBG8_1X8,
.format = V4L2_PIX_FMT_SGRBG8, .format = V4L2_PIX_FMT_SGRBG8,
.datatype = MIPI_CSI2_DT_RAW8, .datatype = MIPI_CSI2_DT_RAW8,
.bpp = 1,
.icndmr = 0, .icndmr = 0,
.yuv = false, .yuv = false,
}, },
@ -48,7 +44,6 @@ static const struct rzg2l_cru_ip_format rzg2l_cru_ip_formats[] = {
.code = MEDIA_BUS_FMT_SRGGB8_1X8, .code = MEDIA_BUS_FMT_SRGGB8_1X8,
.format = V4L2_PIX_FMT_SRGGB8, .format = V4L2_PIX_FMT_SRGGB8,
.datatype = MIPI_CSI2_DT_RAW8, .datatype = MIPI_CSI2_DT_RAW8,
.bpp = 1,
.icndmr = 0, .icndmr = 0,
.yuv = false, .yuv = false,
}, },

10
drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c
View File

@ -939,15 +939,7 @@ static void rzg2l_cru_format_align(struct rzg2l_cru_dev *cru,
v4l_bound_align_image(&pix->width, 320, info->max_width, 1, v4l_bound_align_image(&pix->width, 320, info->max_width, 1,
&pix->height, 240, info->max_height, 2, 0); &pix->height, 240, info->max_height, 2, 0);
if (info->has_stride) { v4l2_fill_pixfmt(pix, pix->pixelformat, pix->width, pix->height);
u32 stride = clamp(pix->bytesperline, pix->width * fmt->bpp,
RZG2L_CRU_STRIDE_MAX);
pix->bytesperline = round_up(stride, RZG2L_CRU_STRIDE_ALIGN);
} else {
pix->bytesperline = pix->width * fmt->bpp;
}
pix->sizeimage = pix->bytesperline * pix->height;
dev_dbg(cru->dev, "Format %ux%u bpl: %u size: %u\n", dev_dbg(cru->dev, "Format %ux%u bpl: %u size: %u\n",
pix->width, pix->height, pix->bytesperline, pix->sizeimage); pix->width, pix->height, pix->bytesperline, pix->sizeimage);