From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
To: Benjamin Gaignard <benjamin.gaignard@collabora.com>,
p.zabel@pengutronix.de, mchehab@kernel.org
Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel@collabora.com
Subject: Re: [PATCH v1 6/7] media: verisilicon: vp9: Use alloc/free helpers for auxiliary buffers
Date: Thu, 19 Nov 2026 17:01:39 -0500 [thread overview]
Message-ID: <21f16b602cbb1b581bb26356e39e86c845d5809a.camel@collabora.com> (raw)
In-Reply-To: <20260916125443.78602-7-benjamin.gaignard@collabora.com>
[-- Attachment #1: Type: text/plain, Size: 3400 bytes --]
Le mercredi 16 septembre 2026 à 14:54 +0200, Benjamin Gaignard a écrit :
> Simplify and clean up the code by using the helpers.
> For upstream it should be merged into only one commit.
What do you want me to do exactly?
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> ---
> .../media/platform/verisilicon/hantro_vp9.c | 37 ++++++-------------
> 1 file changed, 11 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/media/platform/verisilicon/hantro_vp9.c b/drivers/media/platform/verisilicon/hantro_vp9.c
> index 566cd376c097..7a46a4767254 100644
> --- a/drivers/media/platform/verisilicon/hantro_vp9.c
> +++ b/drivers/media/platform/verisilicon/hantro_vp9.c
> @@ -181,23 +181,17 @@ int hantro_vp9_dec_init(struct hantro_ctx *ctx)
> size = hantro_vp9_tile_filter_size(max_height);
> vp9_dec->bsd_ctrl_offset = size;
> size += hantro_vp9_bsd_control_size(max_height);
> -
> - tile_edge->cpu = dma_alloc_coherent(vpu->dev, size, &tile_edge->dma, GFP_KERNEL);
> - if (!tile_edge->cpu)
> + if (hantro_allocate_aux_buf(ctx, tile_edge, size))
> return -ENOMEM;
>
> - tile_edge->size = size;
> memset(tile_edge->cpu, 0, size);
>
> size = hantro_vp9_segment_map_size(max_width, max_height);
> vp9_dec->segment_map_size = size;
> size *= 2; /* we need two areas of this size, used alternately */
> + if (hantro_allocate_aux_buf(ctx, segment_map, size))
> + goto error;
>
> - segment_map->cpu = dma_alloc_coherent(vpu->dev, size, &segment_map->dma, GFP_KERNEL);
> - if (!segment_map->cpu)
> - goto err_segment_map;
> -
> - segment_map->size = size;
> memset(segment_map->cpu, 0, size);
>
> size = hantro_vp9_prob_tab_size();
> @@ -205,36 +199,27 @@ int hantro_vp9_dec_init(struct hantro_ctx *ctx)
> size += hantro_vp9_count_tab_size();
> vp9_dec->tile_info_offset = size;
> size += hantro_vp9_tile_info_size();
> + if (hantro_allocate_aux_buf(ctx, misc, size))
> + goto error;
>
> - misc->cpu = dma_alloc_coherent(vpu->dev, size, &misc->dma, GFP_KERNEL);
> - if (!misc->cpu)
> - goto err_misc;
> -
> - misc->size = size;
> memset(misc->cpu, 0, size);
>
> init_v4l2_vp9_count_tbl(ctx);
>
> return 0;
>
> -err_misc:
> - dma_free_coherent(vpu->dev, segment_map->size, segment_map->cpu, segment_map->dma);
> -
> -err_segment_map:
> - dma_free_coherent(vpu->dev, tile_edge->size, tile_edge->cpu, tile_edge->dma);
> +error:
> + hantro_free_aux_buf(ctx, segment_map);
> + hantro_free_aux_buf(ctx, tile_edge);
>
> return -ENOMEM;
> }
>
> void hantro_vp9_dec_exit(struct hantro_ctx *ctx)
> {
> - struct hantro_dev *vpu = ctx->dev;
> struct hantro_vp9_dec_hw_ctx *vp9_dec = &ctx->vp9_dec;
> - struct hantro_aux_buf *tile_edge = &vp9_dec->tile_edge;
> - struct hantro_aux_buf *segment_map = &vp9_dec->segment_map;
> - struct hantro_aux_buf *misc = &vp9_dec->misc;
>
> - dma_free_coherent(vpu->dev, misc->size, misc->cpu, misc->dma);
> - dma_free_coherent(vpu->dev, segment_map->size, segment_map->cpu, segment_map->dma);
> - dma_free_coherent(vpu->dev, tile_edge->size, tile_edge->cpu, tile_edge->dma);
> + hantro_free_aux_buf(ctx, &vp9_dec->tile_edge);
> + hantro_free_aux_buf(ctx, &vp9_dec->segment_map);
> + hantro_free_aux_buf(ctx, &vp9_dec->misc);
> }
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2026-11-19 22:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-16 12:54 [PATCH v1 0/7] media: verisilicon: simplify auxiliary buffers allocation Benjamin Gaignard
2026-09-16 12:54 ` [PATCH v1 1/7] media: verisilicon: Add helpers to allocate and free auxiliary buffers Benjamin Gaignard
2026-11-19 21:58 ` Nicolas Dufresne
2026-09-16 12:54 ` [PATCH v1 2/7] media: verisilicon: AV1: Use alloc/free helpers for " Benjamin Gaignard
2026-11-19 21:59 ` Nicolas Dufresne
2026-09-16 12:54 ` [PATCH v1 3/7] media: verisilicon: h264: " Benjamin Gaignard
2026-11-19 21:59 ` Nicolas Dufresne
2026-09-16 12:54 ` [PATCH v1 4/7] media: verisilicon: hevc: " Benjamin Gaignard
2026-11-19 22:00 ` Nicolas Dufresne
2026-09-16 12:54 ` [PATCH v1 5/7] media: verisilicon: vp8: " Benjamin Gaignard
2026-11-19 22:00 ` Nicolas Dufresne
2026-09-16 12:54 ` [PATCH v1 6/7] media: verisilicon: vp9: " Benjamin Gaignard
2026-11-19 22:01 ` Nicolas Dufresne [this message]
2026-09-16 12:54 ` [PATCH v1 7/7] media: verisilicon: mpeg4: " Benjamin Gaignard
2026-11-19 22:01 ` Nicolas Dufresne
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=21f16b602cbb1b581bb26356e39e86c845d5809a.camel@collabora.com \
--to=nicolas.dufresne@collabora.com \
--cc=benjamin.gaignard@collabora.com \
--cc=kernel@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®