mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
To: Philipp Zabel <p.zabel@pengutronix.de>,
	Benjamin Gaignard <benjamin.gaignard@collabora.com>,
	mchehab@kernel.org
Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
	 linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/7] media: verisilicon: AV1: Use alloc/free helpers for auxiliary buffers
Date: Fri, 20 Nov 2026 15:11:22 -0500	[thread overview]
Message-ID: <9af91a9239c2905ae0106beea2a16b2764cbc052.camel@collabora.com> (raw)
In-Reply-To: <aecaf769d7db9775e695b7d64e5723d9a6b0b17b.camel@collabora.com>

[-- Attachment #1: Type: text/plain, Size: 5182 bytes --]

Le vendredi 20 novembre 2026 à 15:10 -0500, Nicolas Dufresne a écrit :
> Le vendredi 20 novembre 2026 à 16:56 +0100, Philipp Zabel a écrit :
> > On Fr, 2026-11-20 at 16:13 +0100, Benjamin Gaignard wrote:
> > > Simplify and clean up the code by using the helpers.
> > > 
> > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> > > Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> > > ---
> > >  .../media/platform/verisilicon/hantro_av1.c   | 177 ++++--------------
> > >  1 file changed, 39 insertions(+), 138 deletions(-)
> > > 
> > > diff --git a/drivers/media/platform/verisilicon/hantro_av1.c b/drivers/media/platform/verisilicon/hantro_av1.c
> > > index 2cde32f0e935..e05816c7dfa3 100644
> > > --- a/drivers/media/platform/verisilicon/hantro_av1.c
> > > +++ b/drivers/media/platform/verisilicon/hantro_av1.c
> > > @@ -235,40 +235,17 @@ size_t hantro_av1_chroma_size(struct hantro_ctx *ctx)
> > >  
> > >  static void hantro_av1_tiles_free(struct hantro_ctx *ctx)
> > >  {
> > > -	struct hantro_dev *vpu = ctx->dev;
> > >  	struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;
> > >  
> > > -	if (av1_dec->db_data_col.cpu)
> > > -		dma_free_coherent(vpu->dev, av1_dec->db_data_col.size,
> > > -				  av1_dec->db_data_col.cpu,
> > > -				  av1_dec->db_data_col.dma);
> > > -	av1_dec->db_data_col.cpu = NULL;
> > > -
> > > -	if (av1_dec->db_ctrl_col.cpu)
> > > -		dma_free_coherent(vpu->dev, av1_dec->db_ctrl_col.size,
> > > -				  av1_dec->db_ctrl_col.cpu,
> > > -				  av1_dec->db_ctrl_col.dma);
> > > -	av1_dec->db_ctrl_col.cpu = NULL;
> > > -
> > > -	if (av1_dec->cdef_col.cpu)
> > > -		dma_free_coherent(vpu->dev, av1_dec->cdef_col.size,
> > > -				  av1_dec->cdef_col.cpu, av1_dec->cdef_col.dma);
> > > -	av1_dec->cdef_col.cpu = NULL;
> > > -
> > > -	if (av1_dec->sr_col.cpu)
> > > -		dma_free_coherent(vpu->dev, av1_dec->sr_col.size,
> > > -				  av1_dec->sr_col.cpu, av1_dec->sr_col.dma);
> > > -	av1_dec->sr_col.cpu = NULL;
> > > -
> > > -	if (av1_dec->lr_col.cpu)
> > > -		dma_free_coherent(vpu->dev, av1_dec->lr_col.size,
> > > -				  av1_dec->lr_col.cpu, av1_dec->lr_col.dma);
> > > -	av1_dec->lr_col.cpu = NULL;
> > > +	hantro_free_aux_buf(ctx, &av1_dec->db_data_col);
> > > +	hantro_free_aux_buf(ctx, &av1_dec->db_ctrl_col);
> > > +	hantro_free_aux_buf(ctx, &av1_dec->cdef_col);
> > > +	hantro_free_aux_buf(ctx, &av1_dec->sr_col);
> > > +	hantro_free_aux_buf(ctx, &av1_dec->lr_col);
> > >  }
> > >  
> > >  static int hantro_av1_tiles_reallocate(struct hantro_ctx *ctx)
> > >  {
> > > -	struct hantro_dev *vpu = ctx->dev;
> > >  	struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;
> > >  	struct hantro_av1_dec_ctrls *ctrls = &av1_dec->ctrls;
> > >  	const struct v4l2_av1_tile_info *tile_info = &ctrls->frame->tile_info;
> > > @@ -277,6 +254,7 @@ static int hantro_av1_tiles_reallocate(struct hantro_ctx *ctx)
> > >  	unsigned int height_in_sb = height / 64;
> > >  	unsigned int stripe_num = ((height + 8) + 63) / 64;
> > >  	size_t size;
> > > +	int ret;
> > >  
> > >  	if (av1_dec->db_data_col.size >=
> > >  	    ALIGN(height * 12 * ctx->bit_depth / 8, 128) * num_tile_cols)
> > > @@ -285,44 +263,22 @@ static int hantro_av1_tiles_reallocate(struct hantro_ctx *ctx)
> > >  	hantro_av1_tiles_free(ctx);
> > >  
> > >  	size = ALIGN(height * 12 * ctx->bit_depth / 8, 128) * num_tile_cols;
> > > -	av1_dec->db_data_col.cpu = dma_alloc_coherent(vpu->dev, size,
> > > -						      &av1_dec->db_data_col.dma,
> > > -						      GFP_KERNEL);
> > > -	if (!av1_dec->db_data_col.cpu)
> > > -		goto buffer_allocation_error;
> > > -	av1_dec->db_data_col.size = size;
> > > +	ret = hantro_allocate_aux_buf(ctx, &av1_dec->db_data_col, size);
> > >  
> > >  	size = ALIGN(height * 2 * 16 / 4, 128) * num_tile_cols;
> > > -	av1_dec->db_ctrl_col.cpu = dma_alloc_coherent(vpu->dev, size,
> > > -						      &av1_dec->db_ctrl_col.dma,
> > > -						      GFP_KERNEL);
> > > -	if (!av1_dec->db_ctrl_col.cpu)
> > > -		goto buffer_allocation_error;
> > > -	av1_dec->db_ctrl_col.size = size;
> > > +	ret |= hantro_allocate_aux_buf(ctx, &av1_dec->db_ctrl_col, size);
> > 
> > Please don't |= error return values. Even if it happens to work here
> > because hantro_allocate_aux_buf() is guaranteed to return the same
> > error, it may inspire others to copy this in places where it's invalid.
> > 
> > Further, hantro_allocate_aux_buf() looks like it can return -EINVAL and
> > -ENOMEM, not sure if that can happen inside reallocate. That would
> > combine into -ENOENT, which makes no sense to return.
> 
> Fair enough, I reviewed too quickly and assumed it was boolean. Not very common,
> but something I've seen in the past:
> 
>   	ret = func(params1, ret);
> 	ret = func(params2, ret);
> 	...
> 
> And then:
> 
> int func(params, int ret)
> {
> 	if (!ret)

Of course I mean if (ret) ...

> 		return ret;
> 	
> 	...
> 
> 	return ret;
> }
> 
> That would allow moving the repetitive branch inside hantro_allocate_aux_buf()
> and keep the proposed simplification.
> 
> Nicolas
> 
> > 
> > regards
> > Philipp

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

  reply	other threads:[~2026-11-20 20:11 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 15:13 [PATCH v2 0/7] media: verisilicon: simplify auxiliary buffers allocation Benjamin Gaignard
2026-11-20 15:13 ` [PATCH v2 1/7] media: verisilicon: Add helpers to allocate and free auxiliary buffers Benjamin Gaignard
2026-11-20 15:13 ` [PATCH v2 2/7] media: verisilicon: AV1: Use alloc/free helpers for " Benjamin Gaignard
2026-11-20 15:56   ` Philipp Zabel
2026-11-20 20:10     ` Nicolas Dufresne
2026-11-20 20:11       ` Nicolas Dufresne [this message]
2026-11-20 15:13 ` [PATCH v2 3/7] media: verisilicon: h264: " Benjamin Gaignard
2026-11-20 15:13 ` [PATCH v2 4/7] media: verisilicon: hevc: " Benjamin Gaignard
2026-11-20 15:13 ` [PATCH v2 5/7] media: verisilicon: vp8: " Benjamin Gaignard
2026-11-20 15:13 ` [PATCH v2 6/7] media: verisilicon: vp9: " Benjamin Gaignard
2026-11-20 15:13 ` [PATCH v2 7/7] media: verisilicon: mpeg4: " Benjamin Gaignard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9af91a9239c2905ae0106beea2a16b2764cbc052.camel@collabora.com \
    --to=nicolas.dufresne@collabora.com \
    --cc=benjamin.gaignard@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mchehab@kernel.org \
    --cc=p.zabel@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®