From nobody Mon Feb 9 18:18:26 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 44C452571DA for ; Tue, 7 Oct 2025 08:32:56 +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=1759825978; cv=none; b=WbIKWorLd08ZDSgboPccBXaYx/yRA+155yuScfvDDt3EtSO0S2hkInegULT7+XGkLBlYEjIP+7bXyV5vZn4Z20mDnkzP1jvh885oGHa6V7ju5OLn+z0fudOa1bfsHJMXN3w7VZuO0yIcVExX+WFxe+D+IaOTGeeW9uVnTAIJtEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759825978; c=relaxed/simple; bh=/HFgI/+FFPzyNEIkAXoxPZ3fGijgiQ34KN89cXoqjAQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I1nTGIHzls8FMuVJQZsVi6oTU2mNB3f4pMTZj0IpRJ+iM/8QTLT0hxmJNSKte+0VpctSp29dUYDBRDAWoK0XO/xJ8COfRTrZ731mbqUSaEovO40+bHaY7yN+bV6E7v7BkrVSRX4k6MiFkzpscBzHiysjKoGpk2aCc6LjkidkaA4= 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 1v637u-0002Hb-C4; Tue, 07 Oct 2025 10:32:54 +0200 From: =?utf-8?q?Sven_P=C3=BCschel?= Date: Tue, 07 Oct 2025 10:32:01 +0200 Subject: [PATCH 08/16] media: rockchip: rga: remove size from rga_frame 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: <20251007-spu-rga3-v1-8-36ad85570402@pengutronix.de> References: <20251007-spu-rga3-v1-0-36ad85570402@pengutronix.de> In-Reply-To: <20251007-spu-rga3-v1-0-36ad85570402@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.2 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 The size member is only used for the mmu page table mapping. Therefore avoid storing the value and instead only calculate it in place. This also avoids the calculation entirely when an external iommu is used. Signed-off-by: Sven P=C3=BCschel --- drivers/media/platform/rockchip/rga/rga-buf.c | 6 +++++- drivers/media/platform/rockchip/rga/rga.c | 8 ++------ drivers/media/platform/rockchip/rga/rga.h | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/rockchip/rga/rga-buf.c b/drivers/media/= platform/rockchip/rga/rga-buf.c index 26b66b0c7e008308c24433f061a738a3985484b6..e44fe870fb9e34aa93404b7a600= 22fe441adf8f9 100644 --- a/drivers/media/platform/rockchip/rga/rga-buf.c +++ b/drivers/media/platform/rockchip/rga/rga-buf.c @@ -79,9 +79,13 @@ static int rga_buf_init(struct vb2_buffer *vb) struct rockchip_rga *rga =3D ctx->rga; struct rga_frame *f =3D rga_get_frame(ctx, vb->vb2_queue->type); size_t n_desc =3D 0; + u32 size =3D 0; + u8 i; =20 if (rga_has_internal_iommu(rga)) { - n_desc =3D DIV_ROUND_UP(f->size, PAGE_SIZE); + for (i =3D 0; i < f->pix.num_planes; i++) + size +=3D f->pix.plane_fmt[i].sizeimage; + n_desc =3D DIV_ROUND_UP(size, PAGE_SIZE); =20 rbuf->n_desc =3D n_desc; rbuf->dma_desc =3D dma_alloc_coherent(rga->dev, diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/plat= form/rockchip/rga/rga.c index b8e4be3f9acd8a73a3d4e947aeeef9095543fb49..c5f25869d0cd08a794330954ec4= 14f0428b647d8 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -222,7 +222,6 @@ static int rga_open(struct file *file) }; =20 def_frame.stride =3D (def_frame.width * def_frame.fmt->depth) >> 3; - def_frame.size =3D def_frame.stride * def_frame.height; =20 ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -407,9 +406,6 @@ static int vidioc_s_fmt(struct file *file, void *priv, = struct v4l2_format *f) return PTR_ERR(frm); frm->width =3D pix_fmt->width; frm->height =3D pix_fmt->height; - frm->size =3D 0; - for (i =3D 0; i < pix_fmt->num_planes; i++) - frm->size +=3D pix_fmt->plane_fmt[i].sizeimage; frm->fmt =3D rga_fmt_find(rga, pix_fmt->pixelformat); frm->stride =3D pix_fmt->plane_fmt[0].bytesperline; frm->colorspace =3D pix_fmt->colorspace; @@ -423,10 +419,10 @@ static int vidioc_s_fmt(struct file *file, void *priv= , struct v4l2_format *f) frm->pix =3D *pix_fmt; =20 v4l2_dbg(debug, 1, &rga->v4l2_dev, - "[%s] fmt - %p4cc %dx%d (stride %d, sizeimage %d)\n", + "[%s] fmt - %p4cc %dx%d (stride %d)\n", V4L2_TYPE_IS_OUTPUT(f->type) ? "OUTPUT" : "CAPTURE", &frm->fmt->fourcc, frm->width, frm->height, - frm->stride, frm->size); + frm->stride); =20 for (i =3D 0; i < pix_fmt->num_planes; i++) { v4l2_dbg(debug, 1, &rga->v4l2_dev, diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/plat= form/rockchip/rga/rga.h index 82ead58719f3baadb77575896ca2d430aa8e3dc6..5aedda2f187e4bfef42c8755c4f= c4b1ee5453e8e 100644 --- a/drivers/media/platform/rockchip/rga/rga.h +++ b/drivers/media/platform/rockchip/rga/rga.h @@ -42,7 +42,6 @@ struct rga_frame { =20 /* Variables that can calculated once and reused */ u32 stride; - u32 size; }; =20 struct rga_dma_desc { --=20 2.51.0