From nobody Tue Feb 10 11:23:36 2026 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3046F35CB6E for ; Tue, 27 Jan 2026 14:40:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769524807; cv=none; b=NwTMY3HwXlsyM++PHnre9LZFI+tL7zy5pPKxMQLMhPrv+JJMgAuKtgmxoXoqf1hzQSzxhpdVkgwVxL4+INSmX0RbUaF++Im6xNi507SmAfRkX9H/hHaGH9p8No2TpBMNHYF1yK7dXKpfgqBgu2MNiQRw3Ho0oG3TgQD2eK8iPSs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769524807; c=relaxed/simple; bh=FE0q+9IWB9cdSzVXcVcA+rfDcDAvz7Z0AHtTsxTB21s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=twIUd6lJLdLJ6o+XiFDwSId/A1cEU1XYGc4AGQRy0UXU/xXexYDkmjVpwsclpefsUVoEeSJRAoQyF0jBcNulgSyB2kEzzDeye7agi1ZcHWImy+H4RQKlBqahliwJ2daZ5TeYSxrlsXTFUT3WGXP4h6KPxMEySjpJOH+SoWoqNo4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=peter.mobile.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vkkEe-0007YT-6Z; Tue, 27 Jan 2026 15:40:04 +0100 From: =?utf-8?q?Sven_P=C3=BCschel?= Date: Tue, 27 Jan 2026 15:39:14 +0100 Subject: [PATCH v3 05/27] media: v4l2-common: add v4l2_fill_pixfmt_mp_aligned helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260127-spu-rga3-v3-5-77b273067beb@pengutronix.de> References: <20260127-spu-rga3-v3-0-77b273067beb@pengutronix.de> In-Reply-To: <20260127-spu-rga3-v3-0-77b273067beb@pengutronix.de> To: Jacob Chen , Ezequiel Garcia , Mauro Carvalho Chehab , Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Sven_P=C3=BCschel?= X-Mailer: b4 0.14.3 X-SA-Exim-Connect-IP: 2a0a:edc0:0:900:1d::77 X-SA-Exim-Mail-From: s.pueschel@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Add a v4l2_fill_pixfmt_mp_aligned helper which allows the user to specify a custom stride alignment in bytes. This is necessary for hardware like the Rockchip RGA3, which requires the stride value to be aligned to a 16 bytes boundary. Signed-off-by: Sven P=C3=BCschel --- drivers/media/v4l2-core/v4l2-common.c | 45 +++++++++++++++++++++++++------= ---- include/media/v4l2-common.h | 4 ++++ 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-cor= e/v4l2-common.c index 2b5ccedeb6841..e61506ead9150 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -431,14 +431,15 @@ static inline unsigned int v4l2_format_block_height(c= onst struct v4l2_format_inf } =20 static inline unsigned int v4l2_format_plane_stride(const struct v4l2_form= at_info *info, int plane, - unsigned int width) + unsigned int width, u8 byte_alignment) { unsigned int hdiv =3D plane ? info->hdiv : 1; unsigned int aligned_width =3D ALIGN(width, v4l2_format_block_width(info, plane)); =20 - return DIV_ROUND_UP(aligned_width, hdiv) * - info->bpp[plane] / info->bpp_div[plane]; + return ALIGN(DIV_ROUND_UP(aligned_width, hdiv) * info->bpp[plane] / + info->bpp_div[plane], + byte_alignment); } =20 static inline unsigned int v4l2_format_plane_height(const struct v4l2_form= at_info *info, int plane, @@ -452,9 +453,10 @@ static inline unsigned int v4l2_format_plane_height(co= nst struct v4l2_format_inf } =20 static inline unsigned int v4l2_format_plane_size(const struct v4l2_format= _info *info, int plane, - unsigned int width, unsigned int height) + unsigned int width, unsigned int height, + u8 stride_alignment) { - return v4l2_format_plane_stride(info, plane, width) * + return v4l2_format_plane_stride(info, plane, width, stride_alignment) * v4l2_format_plane_height(info, plane, height); } =20 @@ -475,8 +477,9 @@ void v4l2_apply_frmsize_constraints(u32 *width, u32 *he= ight, } EXPORT_SYMBOL_GPL(v4l2_apply_frmsize_constraints); =20 -int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, - u32 pixelformat, u32 width, u32 height) +int v4l2_fill_pixfmt_mp_aligned(struct v4l2_pix_format_mplane *pixfmt, + u32 pixelformat, u32 width, u32 height, + u8 stride_alignment) { const struct v4l2_format_info *info; struct v4l2_plane_pix_format *plane; @@ -493,23 +496,41 @@ int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane= *pixfmt, =20 if (info->mem_planes =3D=3D 1) { plane =3D &pixfmt->plane_fmt[0]; - plane->bytesperline =3D v4l2_format_plane_stride(info, 0, width); + /* + * In case of multiple planes the stride of the other planes + * is derived from the y stride. To avoid breaking the stride + * alignment for the non y plane, multiply it by 2. + */ + if (info->comp_planes > 1) + stride_alignment *=3D 2; + plane->bytesperline =3D v4l2_format_plane_stride(info, 0, width, + stride_alignment); plane->sizeimage =3D 0; =20 for (i =3D 0; i < info->comp_planes; i++) plane->sizeimage +=3D - v4l2_format_plane_size(info, i, width, height); + v4l2_format_plane_size(info, i, width, height, + stride_alignment); } else { for (i =3D 0; i < info->comp_planes; i++) { plane =3D &pixfmt->plane_fmt[i]; plane->bytesperline =3D - v4l2_format_plane_stride(info, i, width); + v4l2_format_plane_stride(info, i, width, + stride_alignment); plane->sizeimage =3D plane->bytesperline * v4l2_format_plane_height(info, i, height); } } return 0; } +EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt_mp_aligned); + +int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, + u32 pixelformat, u32 width, u32 height) +{ + return v4l2_fill_pixfmt_mp_aligned(pixfmt, pixelformat, + width, height, 1); +} EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt_mp); =20 int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u32 pixelformat, @@ -529,12 +550,12 @@ int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, = u32 pixelformat, pixfmt->width =3D width; pixfmt->height =3D height; pixfmt->pixelformat =3D pixelformat; - pixfmt->bytesperline =3D v4l2_format_plane_stride(info, 0, width); + pixfmt->bytesperline =3D v4l2_format_plane_stride(info, 0, width, 1); pixfmt->sizeimage =3D 0; =20 for (i =3D 0; i < info->comp_planes; i++) pixfmt->sizeimage +=3D - v4l2_format_plane_size(info, i, width, height); + v4l2_format_plane_size(info, i, width, height, 1); return 0; } EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt); diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 401d8506c24b5..edd416178c333 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -558,6 +558,10 @@ int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u= 32 pixelformat, u32 width, u32 height); int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, u32 pixelfo= rmat, u32 width, u32 height); +/* @stride_alignment is a power of 2 value in bytes */ +int v4l2_fill_pixfmt_mp_aligned(struct v4l2_pix_format_mplane *pixfmt, + u32 pixelformat, u32 width, u32 height, + u8 stride_alignment); =20 /** * v4l2_get_link_freq - Get link rate from transmitter --=20 2.52.0