From mboxrd@z Thu Jan 1 00:00:00 1970 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 286153A75B1 for ; Thu, 21 May 2026 14:20:51 +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=1779373252; cv=none; b=Vb3ATntD7Hdq6e4veWFK9sMyu3Q94f/BkRwsbWzpvX1LPJi3qTPoX3Z6r+gEtAdgka+vHYL3Qa0sLAPyjEpQd3CCJ9+kK2V/pXpyzGWjfY3rpDJ63GKLV7U+LQY1tnk1BKRFA1Pns82ovdDs2D1OG4bLNZPE5yY6aBOiCJZVJoA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779373252; c=relaxed/simple; bh=uZuZFiGkVIpive78jmqfdqd9PanT3zEb7jaNsx7S/Cg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=HAT21hFrMGqXvYB3by67hxU4oVplLwImUP0WIhhkMd07OfmsxhcOnrK/mnKMq753iWuhMHF/y+xLuvJPTWLPSpNkBkmYijXdEUq3OleZ5a35gsGssMVFBI71WChExWP2jJXKEP2pZA5Owxy9eiL75cBC/vBjPGH4Mz78jFRK0fo= 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 drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wQ4GG-0008CY-NE; Thu, 21 May 2026 16:20:32 +0200 Received: from pty.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::c5]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wQ4GF-0017OQ-34; Thu, 21 May 2026 16:20:32 +0200 Received: from mtr by pty.whiteo.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1wQ4GG-00000004Wvo-1c98; Thu, 21 May 2026 16:20:32 +0200 Date: Thu, 21 May 2026 16:20:32 +0200 From: Michael Tretter To: Sven =?utf-8?Q?P=C3=BCschel?= Cc: Jacob Chen , Ezequiel Garcia , Mauro Carvalho Chehab , Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hans Verkuil , 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, nicolas@ndufresne.ca, sebastian.reichel@collabora.com, p.zabel@pengutronix.de, Nicolas Dufresne Subject: Re: [PATCH v7 14/28] media: rockchip: rga: move cmdbuf to rga_ctx Message-ID: Mail-Followup-To: Michael Tretter , Sven =?utf-8?Q?P=C3=BCschel?= , Jacob Chen , Ezequiel Garcia , Mauro Carvalho Chehab , Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hans Verkuil , 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, nicolas@ndufresne.ca, sebastian.reichel@collabora.com, p.zabel@pengutronix.de, Nicolas Dufresne References: <20260521-spu-rga3-v7-0-3f33e8c7145f@pengutronix.de> <20260521-spu-rga3-v7-14-3f33e8c7145f@pengutronix.de> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20260521-spu-rga3-v7-14-3f33e8c7145f@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: m.tretter@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: devicetree@vger.kernel.org On Thu, 21 May 2026 00:44:19 +0200, Sven Püschel wrote: > Move the command buffer to the rga_ctx struct in preparation to reuse > an already prepared command buffer. This allows to split the command > buffer setup in a further commit to setup a template for the command > buffer at streamon and only update the buffer addresses in device_run > and trigger the command stream. No sync point is added, as one command > buffer should only be used for one conversion at a time. > > Reviewed-by: Nicolas Dufresne > Signed-off-by: Sven Püschel Reviewed-by: Michael Tretter > --- > 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/platform/rockchip/rga/rga-hw.c > index 17f7a67c0b4bb..9881c14f908d5 100644 > --- a/drivers/media/platform/rockchip/rga/rga-hw.c > +++ b/drivers/media/platform/rockchip/rga/rga-hw.c > @@ -122,8 +122,7 @@ static struct rga_addr_offset *rga_lookup_draw_pos(struct > > static void rga_cmd_set_src_addr(struct rga_ctx *ctx, dma_addr_t dma_addr) > { > - struct rockchip_rga *rga = ctx->rga; > - u32 *dest = rga->cmdbuf_virt; > + u32 *dest = ctx->cmdbuf_virt; > unsigned int reg; > > reg = RGA_MMU_SRC_BASE - RGA_MODE_BASE_REG; > @@ -135,8 +134,7 @@ static void rga_cmd_set_src_addr(struct rga_ctx *ctx, dma_addr_t dma_addr) > > static void rga_cmd_set_src1_addr(struct rga_ctx *ctx, dma_addr_t dma_addr) > { > - struct rockchip_rga *rga = ctx->rga; > - u32 *dest = rga->cmdbuf_virt; > + u32 *dest = ctx->cmdbuf_virt; > unsigned int reg; > > reg = RGA_MMU_SRC1_BASE - RGA_MODE_BASE_REG; > @@ -148,8 +146,7 @@ static void rga_cmd_set_src1_addr(struct rga_ctx *ctx, dma_addr_t dma_addr) > > static void rga_cmd_set_dst_addr(struct rga_ctx *ctx, dma_addr_t dma_addr) > { > - struct rockchip_rga *rga = ctx->rga; > - u32 *dest = rga->cmdbuf_virt; > + u32 *dest = ctx->cmdbuf_virt; > unsigned int reg; > > reg = RGA_MMU_DST_BASE - RGA_MODE_BASE_REG; > @@ -162,7 +159,7 @@ static void rga_cmd_set_dst_addr(struct rga_ctx *ctx, dma_addr_t dma_addr) > static void rga_cmd_set_trans_info(struct rga_ctx *ctx) > { > struct rockchip_rga *rga = ctx->rga; > - u32 *dest = rga->cmdbuf_virt; > + u32 *dest = 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; > @@ -322,8 +319,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 = ctx->rga; > - u32 *dest = rga->cmdbuf_virt; > + u32 *dest = ctx->cmdbuf_virt; > unsigned int src_h, src_w, src_x, src_y; > > src_h = ctx->in.crop.height; > @@ -350,8 +346,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 = ctx->rga; > - u32 *dest = rga->cmdbuf_virt; > + u32 *dest = ctx->cmdbuf_virt; > unsigned int dst_h, dst_w, dst_x, dst_y; > unsigned int mir_mode = 0; > unsigned int rot_mode = 0; > @@ -397,8 +392,7 @@ static void rga_cmd_set_dst_info(struct rga_ctx *ctx, > > static void rga_cmd_set_mode(struct rga_ctx *ctx) > { > - struct rockchip_rga *rga = ctx->rga; > - u32 *dest = rga->cmdbuf_virt; > + u32 *dest = ctx->cmdbuf_virt; > union rga_mode_ctrl mode; > union rga_alpha_ctrl0 alpha_ctrl0; > union rga_alpha_ctrl1 alpha_ctrl1; > @@ -423,7 +417,7 @@ static void rga_cmd_set(struct rga_ctx *ctx, > { > struct rockchip_rga *rga = ctx->rga; > > - memset(rga->cmdbuf_virt, 0, RGA_CMDBUF_SIZE); > + memset(ctx->cmdbuf_virt, 0, RGA_CMDBUF_SIZE); > > rga_cmd_set_src_addr(ctx, src->dma_desc_pa); > /* > @@ -439,11 +433,11 @@ static void rga_cmd_set(struct rga_ctx *ctx, > rga_cmd_set_dst_info(ctx, &dst->offset); > rga_cmd_set_trans_info(ctx); > > - rga_write(rga, RGA_CMD_BASE, rga->cmdbuf_phy); > + rga_write(rga, RGA_CMD_BASE, ctx->cmdbuf_phy); > > /* 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); > } > > static void rga_hw_start(struct rockchip_rga *rga, > diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c > index 77b8c7ab74274..bf6bbcbfc869b 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 = kzalloc_obj(*ctx); > if (!ctx) > return -ENOMEM; > + > + /* Create CMD buffer */ > + ctx->cmdbuf_virt = dma_alloc_attrs(rga->dev, rga->hw->cmdbuf_size, > + &ctx->cmdbuf_phy, GFP_KERNEL, > + DMA_ATTR_WRITE_COMBINE); > + if (!ctx->cmdbuf_virt) { > + ret = -ENOMEM; > + goto rel_ctx; > + } > + > ctx->rga = rga; > /* Set default formats */ > ctx->in = def_frame; > @@ -230,15 +240,13 @@ static int rga_open(struct file *file) > ctx->out.fmt->fourcc, def_width, def_height); > > if (mutex_lock_interruptible(&rga->mutex)) { > - kfree(ctx); > - return -ERESTARTSYS; > + ret = -ERESTARTSYS; > + goto rel_cmdbuf; > } > ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(rga->m2m_dev, ctx, &queue_init); > if (IS_ERR(ctx->fh.m2m_ctx)) { > ret = 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); > > 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; > } > > 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); > > mutex_unlock(&rga->mutex); > @@ -720,19 +741,10 @@ static int rga_probe(struct platform_device *pdev) > > pm_runtime_put(rga->dev); > > - /* Create CMD buffer */ > - rga->cmdbuf_virt = dma_alloc_attrs(rga->dev, rga->hw->cmdbuf_size, > - &rga->cmdbuf_phy, GFP_KERNEL, > - DMA_ATTR_WRITE_COMBINE); > - if (!rga->cmdbuf_virt) { > - ret = -ENOMEM; > - goto rel_m2m; > - } > - > ret = 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; > } > > v4l2_info(&rga->v4l2_dev, "Registered %s as /dev/%s\n", > @@ -740,9 +752,6 @@ static int rga_probe(struct platform_device *pdev) > > return 0; > > -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: > @@ -759,9 +768,6 @@ static void rga_remove(struct platform_device *pdev) > { > struct rockchip_rga *rga = platform_get_drvdata(pdev); > > - 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"); > > v4l2_m2m_release(rga->m2m_dev); > diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h > index 27b3c9b4f220c..04aeb7b429523 100644 > --- a/drivers/media/platform/rockchip/rga/rga.h > +++ b/drivers/media/platform/rockchip/rga/rga.h > @@ -53,6 +53,9 @@ struct rga_ctx { > struct rga_frame out; > struct v4l2_ctrl_handler ctrl_handler; > > + void *cmdbuf_virt; > + dma_addr_t cmdbuf_phy; > + > int osequence; > int csequence; > > @@ -89,8 +92,6 @@ struct rockchip_rga { > spinlock_t ctrl_lock; > > struct rga_ctx *curr; > - dma_addr_t cmdbuf_phy; > - void *cmdbuf_virt; > > const struct rga_hw *hw; > }; > > -- > 2.54.0 > >