From nobody Mon Feb 9 22:39:06 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 E917735D615 for ; Tue, 27 Jan 2026 14:40:30 +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=1769524832; cv=none; b=n4iSjy7fgivtov+gtNyaBLrXoXIfUonXYPynjPsOi3/hTowG0BK5hof2LWk5kOEb2KvgHtqXFOb4AZaBShn38iIbsF8zyvaoploHVFmduhtiv10EElLGTC83Q/d5XLcr0hHC+C7voZyals/4dP51EeKbyrCy/6v+7KFa9qKzrME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769524832; c=relaxed/simple; bh=J6XXFWpx2j/S2nJfW149OVH+tylhl3sW1jNNdXITzo8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=btV+jgVSxNowDp2uBH5db3ZPfrZnKW78/X0T5kyz8bqTJJNaXONxNb9wmptZpupzz62hYfNZTw9zNlkF8Z6NTSGQnQJmXjwzGeYNenK/Yc474FWq03vQ2qEp4t2XbXr425G/vwAA0rr4DzuENFYq6nehjKb72nrtr/vrBlKtcAg= 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 1vkkF2-0007YT-N2; Tue, 27 Jan 2026 15:40:29 +0100 From: =?utf-8?q?Sven_P=C3=BCschel?= Date: Tue, 27 Jan 2026 15:39:25 +0100 Subject: [PATCH v3 16/27] media: rockchip: rga: check scaling factor 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-16-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 Check the scaling factor to avoid potential problems. This is relevant for the upcoming RGA3 support, as it can hang when the scaling factor is exceeded. There are two relevant scenarios that have to be considered to protect against invalid scaling values: When the output or capture is already streaming, setting the format on the other side should consider the max scaling factor and clamp it accordingly. This is only done in the streaming case, as it otherwise may unintentionally clamp the value when the application sets the first format (due to a default format on the other side). When the format is set on both sides first, then the format won't be corrected by above means. Therefore the second streamon call has to check the scaling factor and fail otherwise. As try functions should only be state aware if specified, the scaling limitation is only done in s_fmt. Signed-off-by: Sven P=C3=BCschel --- drivers/media/platform/rockchip/rga/rga-hw.c | 1 + drivers/media/platform/rockchip/rga/rga-hw.h | 1 + drivers/media/platform/rockchip/rga/rga.c | 47 ++++++++++++++++++++++++= ++++ drivers/media/platform/rockchip/rga/rga.h | 1 + 4 files changed, 50 insertions(+) diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/p= latform/rockchip/rga/rga-hw.c index dcd540ed3fd5b..7a4070665fed7 100644 --- a/drivers/media/platform/rockchip/rga/rga-hw.c +++ b/drivers/media/platform/rockchip/rga/rga-hw.c @@ -584,6 +584,7 @@ const struct rga_hw rga2_hw =3D { .max_width =3D MAX_WIDTH, .min_height =3D MIN_HEIGHT, .max_height =3D MAX_HEIGHT, + .max_scaling_factor =3D MAX_SCALING_FACTOR, .stride_alignment =3D 4, =20 .setup_cmdbuf =3D rga_hw_setup_cmdbuf, diff --git a/drivers/media/platform/rockchip/rga/rga-hw.h b/drivers/media/p= latform/rockchip/rga/rga-hw.h index f4752aa823051..fffcab0131225 100644 --- a/drivers/media/platform/rockchip/rga/rga-hw.h +++ b/drivers/media/platform/rockchip/rga/rga-hw.h @@ -14,6 +14,7 @@ =20 #define MIN_WIDTH 34 #define MIN_HEIGHT 34 +#define MAX_SCALING_FACTOR 16 =20 #define RGA_TIMEOUT 500 =20 diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/plat= form/rockchip/rga/rga.c index 6947c472a8b01..fad921ddd8348 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -405,10 +405,36 @@ static int vidioc_s_fmt(struct file *file, void *priv= , struct v4l2_format *f) struct v4l2_pix_format_mplane *pix_fmt =3D &f->fmt.pix_mp; struct rga_ctx *ctx =3D file_to_rga_ctx(file); struct rockchip_rga *rga =3D ctx->rga; + const struct rga_hw *hw =3D rga->hw; struct vb2_queue *vq; struct rga_frame *frm; int ret =3D 0; int i; + struct rga_frame *limit_frm =3D NULL; + + /* Limit before try_fmt to avoid recalculating the stride */ + if (V4L2_TYPE_IS_OUTPUT(f->type) && + v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx)->streaming) + limit_frm =3D &ctx->out; + if (V4L2_TYPE_IS_CAPTURE(f->type) && + v4l2_m2m_get_src_vq(ctx->fh.m2m_ctx)->streaming) + limit_frm =3D &ctx->in; + if (limit_frm) { + const struct v4l2_frmsize_stepwise frmsize =3D { + .min_width =3D DIV_ROUND_UP(limit_frm->pix.width, + hw->max_scaling_factor), + .max_width =3D + limit_frm->pix.width * hw->max_scaling_factor, + .min_height =3D DIV_ROUND_UP(limit_frm->pix.height, + hw->max_scaling_factor), + .max_height =3D + limit_frm->pix.height * hw->max_scaling_factor, + .step_width =3D 1, + .step_height =3D 1, + }; + v4l2_apply_frmsize_constraints(&pix_fmt->width, + &pix_fmt->height, &frmsize); + } =20 /* Adjust all values accordingly to the hardware capabilities * and chosen format. @@ -568,12 +594,33 @@ static int vidioc_s_selection(struct file *file, void= *priv, return ret; } =20 +static bool check_scaling(const struct rga_hw *hw, u32 src_size, u32 dst_s= ize) +{ + if (src_size < dst_size) + return src_size * hw->max_scaling_factor >=3D dst_size; + else + return dst_size * hw->max_scaling_factor >=3D src_size; +} + static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type type) { struct rga_ctx *ctx =3D file_to_rga_ctx(file); const struct rga_hw *hw =3D ctx->rga->hw; =20 + if ((V4L2_TYPE_IS_OUTPUT(type) && + v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx)->streaming) || + (V4L2_TYPE_IS_CAPTURE(type) && + v4l2_m2m_get_src_vq(ctx->fh.m2m_ctx)->streaming)) { + /* + * As the other side is already streaming, + * check that the max scaling factor isn't exceeded. + */ + if (!check_scaling(hw, ctx->in.pix.width, ctx->out.pix.width) || + !check_scaling(hw, ctx->in.pix.height, ctx->out.pix.height)) + return -EINVAL; + } + hw->setup_cmdbuf(ctx); =20 return v4l2_m2m_streamon(file, ctx->fh.m2m_ctx, type); diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/plat= form/rockchip/rga/rga.h index c741213710b32..454af283b1694 100644 --- a/drivers/media/platform/rockchip/rga/rga.h +++ b/drivers/media/platform/rockchip/rga/rga.h @@ -150,6 +150,7 @@ struct rga_hw { size_t cmdbuf_size; u32 min_width, min_height; u32 max_width, max_height; + u8 max_scaling_factor; u8 stride_alignment; =20 void (*setup_cmdbuf)(struct rga_ctx *ctx); --=20 2.52.0