From nobody Mon Feb 9 22:24:27 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 E941D33D6D0 for ; Wed, 3 Dec 2025 15:54:21 +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=1764777263; cv=none; b=EfAE+gaa5bn9gdeHTINlUAY0Q0Ug9t2yxClSZ/ikWr6Mty0doNo/BRGHFBtBb1h0C38EO59l4ZlFXGoW3/e+vfSHmA+009DVU5B47D0AynQ//o5S4svqTW+VUC4StxxWz6u7eU5NF8xCTXL8wXsPcXihtV2CVuX+UKATdMZDYRE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777263; c=relaxed/simple; bh=L2iLaXrXDgV/SzCQxLDBonc8cVclGsWi8P33ttvy9/w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FEZpcARfSySlHdWSxazO7AF3NIVWk6SBj+uFGV9uTeaMQMXt/0CFcDti2r6loT9OXby0FPGWwVXbSvw3GgMiL6sK9i2gofN/Wp9Llb7+0kt32nrdsgjXo4FF2pWk/se7hlgho2WsrzkhDT9wkNiur1sprUlNJ1hgZqKNcMoqPaI= 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 1vQpAd-0007dW-9C; Wed, 03 Dec 2025 16:53:35 +0100 From: =?utf-8?q?Sven_P=C3=BCschel?= Date: Wed, 03 Dec 2025 16:52:30 +0100 Subject: [PATCH v2 08/22] media: rockchip: rga: move cmdbuf to rga_ctx 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: <20251203-spu-rga3-v2-8-989a67947f71@pengutronix.de> References: <20251203-spu-rga3-v2-0-989a67947f71@pengutronix.de> In-Reply-To: <20251203-spu-rga3-v2-0-989a67947f71@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 Move the command buffer to the rga_ctx struct in preparation to reuse an already prepared command buffer. Having a command buffer per context allows to reuse the command buffer for other frames even when multiple applications are using the RGA in at the same time. Signed-off-by: Sven P=C3=BCschel Reviewed-by: Nicolas Dufresne --- drivers/media/platform/rockchip/rga/rga-hw.c | 28 +++++++--------- drivers/media/platform/rockchip/rga/rga.c | 48 ++++++++++++++++--------= ---- drivers/media/platform/rockchip/rga/rga.h | 5 +-- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/p= latform/rockchip/rga/rga-hw.c index 7419784efc693..79bf911e74779 100644 --- a/drivers/media/platform/rockchip/rga/rga-hw.c +++ b/drivers/media/platform/rockchip/rga/rga-hw.c @@ -113,8 +113,7 @@ static struct rga_addr_offset *rga_lookup_draw_pos(stru= ct =20 static void rga_cmd_set_src_addr(struct rga_ctx *ctx, dma_addr_t dma_addr) { - struct rockchip_rga *rga =3D ctx->rga; - u32 *dest =3D rga->cmdbuf_virt; + u32 *dest =3D ctx->cmdbuf_virt; unsigned int reg; =20 reg =3D RGA_MMU_SRC_BASE - RGA_MODE_BASE_REG; @@ -126,8 +125,7 @@ static void rga_cmd_set_src_addr(struct rga_ctx *ctx, d= ma_addr_t dma_addr) =20 static void rga_cmd_set_src1_addr(struct rga_ctx *ctx, dma_addr_t dma_addr) { - struct rockchip_rga *rga =3D ctx->rga; - u32 *dest =3D rga->cmdbuf_virt; + u32 *dest =3D ctx->cmdbuf_virt; unsigned int reg; =20 reg =3D RGA_MMU_SRC1_BASE - RGA_MODE_BASE_REG; @@ -139,8 +137,7 @@ static void rga_cmd_set_src1_addr(struct rga_ctx *ctx, = dma_addr_t dma_addr) =20 static void rga_cmd_set_dst_addr(struct rga_ctx *ctx, dma_addr_t dma_addr) { - struct rockchip_rga *rga =3D ctx->rga; - u32 *dest =3D rga->cmdbuf_virt; + u32 *dest =3D ctx->cmdbuf_virt; unsigned int reg; =20 reg =3D RGA_MMU_DST_BASE - RGA_MODE_BASE_REG; @@ -153,7 +150,7 @@ static void rga_cmd_set_dst_addr(struct rga_ctx *ctx, d= ma_addr_t dma_addr) static void rga_cmd_set_trans_info(struct rga_ctx *ctx) { struct rockchip_rga *rga =3D ctx->rga; - u32 *dest =3D rga->cmdbuf_virt; + u32 *dest =3D ctx->cmdbuf_virt; unsigned int scale_dst_w, scale_dst_h; unsigned int src_h, src_w, dst_h, dst_w; union rga_src_info src_info; @@ -313,8 +310,7 @@ static void rga_cmd_set_src_info(struct rga_ctx *ctx, struct rga_addr_offset *offset) { struct rga_corners_addr_offset src_offsets; - struct rockchip_rga *rga =3D ctx->rga; - u32 *dest =3D rga->cmdbuf_virt; + u32 *dest =3D ctx->cmdbuf_virt; unsigned int src_h, src_w, src_x, src_y; =20 src_h =3D ctx->in.crop.height; @@ -341,8 +337,7 @@ static void rga_cmd_set_dst_info(struct rga_ctx *ctx, { struct rga_addr_offset *dst_offset; struct rga_corners_addr_offset offsets; - struct rockchip_rga *rga =3D ctx->rga; - u32 *dest =3D rga->cmdbuf_virt; + u32 *dest =3D ctx->cmdbuf_virt; unsigned int dst_h, dst_w, dst_x, dst_y; unsigned int mir_mode =3D 0; unsigned int rot_mode =3D 0; @@ -388,8 +383,7 @@ static void rga_cmd_set_dst_info(struct rga_ctx *ctx, =20 static void rga_cmd_set_mode(struct rga_ctx *ctx) { - struct rockchip_rga *rga =3D ctx->rga; - u32 *dest =3D rga->cmdbuf_virt; + u32 *dest =3D ctx->cmdbuf_virt; union rga_mode_ctrl mode; union rga_alpha_ctrl0 alpha_ctrl0; union rga_alpha_ctrl1 alpha_ctrl1; @@ -414,7 +408,7 @@ static void rga_cmd_set(struct rga_ctx *ctx, { struct rockchip_rga *rga =3D ctx->rga; =20 - memset(rga->cmdbuf_virt, 0, RGA_CMDBUF_SIZE * 4); + memset(ctx->cmdbuf_virt, 0, RGA_CMDBUF_SIZE * 4); =20 rga_cmd_set_src_addr(ctx, src->dma_desc_pa); /* @@ -430,11 +424,11 @@ static void rga_cmd_set(struct rga_ctx *ctx, rga_cmd_set_dst_info(ctx, &dst->offset); rga_cmd_set_trans_info(ctx); =20 - rga_write(rga, RGA_CMD_BASE, rga->cmdbuf_phy); + rga_write(rga, RGA_CMD_BASE, ctx->cmdbuf_phy); =20 /* sync CMD buf for RGA */ - dma_sync_single_for_device(rga->dev, rga->cmdbuf_phy, - PAGE_SIZE, DMA_BIDIRECTIONAL); + dma_sync_single_for_device(rga->dev, ctx->cmdbuf_phy, + PAGE_SIZE, DMA_BIDIRECTIONAL); } =20 static void rga_hw_start(struct rockchip_rga *rga, diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/plat= form/rockchip/rga/rga.c index d8b14c2d9f6a4..74d94c7fe31ff 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -219,6 +219,16 @@ static int rga_open(struct file *file) ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) return -ENOMEM; + + /* Create CMD buffer */ + ctx->cmdbuf_virt =3D dma_alloc_attrs(rga->dev, rga->hw->cmdbuf_size, + &ctx->cmdbuf_phy, GFP_KERNEL, + DMA_ATTR_WRITE_COMBINE); + if (!ctx->cmdbuf_virt) { + ret =3D -ENOMEM; + goto rel_ctx; + } + ctx->rga =3D rga; /* Set default formats */ ctx->in =3D def_frame; @@ -230,15 +240,13 @@ static int rga_open(struct file *file) ctx->out.fmt->fourcc, def_width, def_height); =20 if (mutex_lock_interruptible(&rga->mutex)) { - kfree(ctx); - return -ERESTARTSYS; + ret =3D -ERESTARTSYS; + goto rel_cmdbuf; } ctx->fh.m2m_ctx =3D v4l2_m2m_ctx_init(rga->m2m_dev, ctx, &queue_init); if (IS_ERR(ctx->fh.m2m_ctx)) { ret =3D PTR_ERR(ctx->fh.m2m_ctx); - mutex_unlock(&rga->mutex); - kfree(ctx); - return ret; + goto unlock_mutex; } v4l2_fh_init(&ctx->fh, video_devdata(file)); v4l2_fh_add(&ctx->fh, file); @@ -252,6 +260,15 @@ static int rga_open(struct file *file) mutex_unlock(&rga->mutex); =20 return 0; + +unlock_mutex: + mutex_unlock(&rga->mutex); +rel_cmdbuf: + dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, ctx->cmdbuf_virt, + ctx->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE); +rel_ctx: + kfree(ctx); + return ret; } =20 static int rga_release(struct file *file) @@ -266,6 +283,10 @@ static int rga_release(struct file *file) v4l2_ctrl_handler_free(&ctx->ctrl_handler); v4l2_fh_del(&ctx->fh, file); v4l2_fh_exit(&ctx->fh); + + dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, ctx->cmdbuf_virt, + ctx->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE); + kfree(ctx); =20 mutex_unlock(&rga->mutex); @@ -674,19 +695,10 @@ static int rga_probe(struct platform_device *pdev) =20 pm_runtime_put(rga->dev); =20 - /* Create CMD buffer */ - rga->cmdbuf_virt =3D dma_alloc_attrs(rga->dev, rga->hw->cmdbuf_size, - &rga->cmdbuf_phy, GFP_KERNEL, - DMA_ATTR_WRITE_COMBINE); - if (!rga->cmdbuf_virt) { - ret =3D -ENOMEM; - goto rel_m2m; - } - ret =3D video_register_device(vfd, VFL_TYPE_VIDEO, -1); if (ret) { v4l2_err(&rga->v4l2_dev, "Failed to register video device\n"); - goto free_dma; + goto rel_m2m; } =20 v4l2_info(&rga->v4l2_dev, "Registered %s as /dev/%s\n", @@ -694,9 +706,6 @@ static int rga_probe(struct platform_device *pdev) =20 return 0; =20 -free_dma: - dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, rga->cmdbuf_virt, - rga->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE); rel_m2m: v4l2_m2m_release(rga->m2m_dev); rel_vdev: @@ -713,9 +722,6 @@ static void rga_remove(struct platform_device *pdev) { struct rockchip_rga *rga =3D platform_get_drvdata(pdev); =20 - dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, rga->cmdbuf_virt, - rga->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE); - v4l2_info(&rga->v4l2_dev, "Removing\n"); =20 v4l2_m2m_release(rga->m2m_dev); diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/plat= form/rockchip/rga/rga.h index 98635ddd50d7c..f8c932fdec21a 100644 --- a/drivers/media/platform/rockchip/rga/rga.h +++ b/drivers/media/platform/rockchip/rga/rga.h @@ -56,6 +56,9 @@ struct rga_ctx { struct rga_frame out; struct v4l2_ctrl_handler ctrl_handler; =20 + void *cmdbuf_virt; + dma_addr_t cmdbuf_phy; + int osequence; int csequence; =20 @@ -91,8 +94,6 @@ struct rockchip_rga { spinlock_t ctrl_lock; =20 struct rga_ctx *curr; - dma_addr_t cmdbuf_phy; - void *cmdbuf_virt; =20 const struct rga_hw *hw; }; --=20 2.52.0