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 2/7] media: verisilicon: AV1: Use alloc/free helpers for auxiliary buffers
Date: Thu, 19 Nov 2026 16:59:07 -0500 [thread overview]
Message-ID: <1839823f5991456eda0e6b447f3eac34a1cdd1cf.camel@collabora.com> (raw)
In-Reply-To: <20260916125443.78602-3-benjamin.gaignard@collabora.com>
[-- Attachment #1: Type: text/plain, Size: 9872 bytes --]
Le mercredi 16 septembre 2026 à 14:54 +0200, Benjamin Gaignard a écrit :
> 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);
>
> size = ALIGN(height_in_sb * 44 * ctx->bit_depth * 16 / 8, 128) * num_tile_cols;
> - av1_dec->cdef_col.cpu = dma_alloc_coherent(vpu->dev, size,
> - &av1_dec->cdef_col.dma,
> - GFP_KERNEL);
> - if (!av1_dec->cdef_col.cpu)
> - goto buffer_allocation_error;
> - av1_dec->cdef_col.size = size;
> + ret |= hantro_allocate_aux_buf(ctx, &av1_dec->cdef_col, size);
>
> size = ALIGN(height_in_sb * (3040 + 1280), 128) * num_tile_cols;
> - av1_dec->sr_col.cpu = dma_alloc_coherent(vpu->dev, size,
> - &av1_dec->sr_col.dma,
> - GFP_KERNEL);
> - if (!av1_dec->sr_col.cpu)
> - goto buffer_allocation_error;
> - av1_dec->sr_col.size = size;
> + ret |= hantro_allocate_aux_buf(ctx, &av1_dec->sr_col, size);
>
> size = ALIGN(stripe_num * 1536 * ctx->bit_depth / 8, 128) * num_tile_cols;
> - av1_dec->lr_col.cpu = dma_alloc_coherent(vpu->dev, size,
> - &av1_dec->lr_col.dma,
> - GFP_KERNEL);
> - if (!av1_dec->lr_col.cpu)
> + ret |= hantro_allocate_aux_buf(ctx, &av1_dec->lr_col, size);
> +
> + if (ret)
> goto buffer_allocation_error;
> - av1_dec->lr_col.size = size;
>
> av1_dec->num_tile_cols_allocated = num_tile_cols;
> return 0;
> @@ -334,105 +290,50 @@ static int hantro_av1_tiles_reallocate(struct hantro_ctx *ctx)
>
> void hantro_av1_exit(struct hantro_ctx *ctx)
> {
> - struct hantro_dev *vpu = ctx->dev;
> struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;
>
> - if (av1_dec->global_model.cpu)
> - dma_free_coherent(vpu->dev, av1_dec->global_model.size,
> - av1_dec->global_model.cpu,
> - av1_dec->global_model.dma);
> - av1_dec->global_model.cpu = NULL;
> -
> - if (av1_dec->tile_info.cpu)
> - dma_free_coherent(vpu->dev, av1_dec->tile_info.size,
> - av1_dec->tile_info.cpu,
> - av1_dec->tile_info.dma);
> - av1_dec->tile_info.cpu = NULL;
> -
> - if (av1_dec->film_grain.cpu)
> - dma_free_coherent(vpu->dev, av1_dec->film_grain.size,
> - av1_dec->film_grain.cpu,
> - av1_dec->film_grain.dma);
> - av1_dec->film_grain.cpu = NULL;
> -
> - if (av1_dec->prob_tbl.cpu)
> - dma_free_coherent(vpu->dev, av1_dec->prob_tbl.size,
> - av1_dec->prob_tbl.cpu, av1_dec->prob_tbl.dma);
> - av1_dec->prob_tbl.cpu = NULL;
> -
> - if (av1_dec->prob_tbl_out.cpu)
> - dma_free_coherent(vpu->dev, av1_dec->prob_tbl_out.size,
> - av1_dec->prob_tbl_out.cpu,
> - av1_dec->prob_tbl_out.dma);
> - av1_dec->prob_tbl_out.cpu = NULL;
> -
> - if (av1_dec->tile_buf.cpu)
> - dma_free_coherent(vpu->dev, av1_dec->tile_buf.size,
> - av1_dec->tile_buf.cpu, av1_dec->tile_buf.dma);
> - av1_dec->tile_buf.cpu = NULL;
> + hantro_free_aux_buf(ctx, &av1_dec->global_model);
> + hantro_free_aux_buf(ctx, &av1_dec->tile_info);
> + hantro_free_aux_buf(ctx, &av1_dec->film_grain);
> + hantro_free_aux_buf(ctx, &av1_dec->prob_tbl);
> + hantro_free_aux_buf(ctx, &av1_dec->prob_tbl_out);
>
> hantro_av1_tiles_free(ctx);
> }
>
> int hantro_av1_init(struct hantro_ctx *ctx)
> {
> - struct hantro_dev *vpu = ctx->dev;
> struct hantro_av1_dec_hw_ctx *av1_dec = &ctx->av1_dec;
> + int ret = 0;
>
> memset(av1_dec, 0, sizeof(*av1_dec));
>
> - av1_dec->global_model.cpu = dma_alloc_coherent(vpu->dev, GLOBAL_MODEL_SIZE,
> - &av1_dec->global_model.dma,
> - GFP_KERNEL);
> - if (!av1_dec->global_model.cpu)
> - return -ENOMEM;
> - av1_dec->global_model.size = GLOBAL_MODEL_SIZE;
> -
> - av1_dec->tile_info.cpu = dma_alloc_coherent(vpu->dev, AV1_TILE_INFO_SIZE,
> - &av1_dec->tile_info.dma,
> - GFP_KERNEL);
> - if (!av1_dec->tile_info.cpu)
> - return -ENOMEM;
> - av1_dec->tile_info.size = AV1_TILE_INFO_SIZE;
> -
> - av1_dec->film_grain.cpu = dma_alloc_coherent(vpu->dev,
> - ALIGN(sizeof(struct hantro_av1_film_grain),
> - 2048),
> - &av1_dec->film_grain.dma,
> - GFP_KERNEL);
> - if (!av1_dec->film_grain.cpu)
> - return -ENOMEM;
> - av1_dec->film_grain.size = ALIGN(sizeof(struct hantro_av1_film_grain), 2048);
> -
> - av1_dec->prob_tbl.cpu = dma_alloc_coherent(vpu->dev,
> - ALIGN(sizeof(struct av1cdfs), 2048),
> - &av1_dec->prob_tbl.dma,
> - GFP_KERNEL);
> - if (!av1_dec->prob_tbl.cpu)
> - return -ENOMEM;
> - av1_dec->prob_tbl.size = ALIGN(sizeof(struct av1cdfs), 2048);
> -
> - av1_dec->prob_tbl_out.cpu = dma_alloc_coherent(vpu->dev,
> - ALIGN(sizeof(struct av1cdfs), 2048),
> - &av1_dec->prob_tbl_out.dma,
> - GFP_KERNEL);
> - if (!av1_dec->prob_tbl_out.cpu)
> - return -ENOMEM;
> - av1_dec->prob_tbl_out.size = ALIGN(sizeof(struct av1cdfs), 2048);
> + ret |= hantro_allocate_aux_buf(ctx, &av1_dec->global_model, GLOBAL_MODEL_SIZE);
> + ret |= hantro_allocate_aux_buf(ctx, &av1_dec->tile_info, AV1_TILE_INFO_SIZE);
> + ret |= hantro_allocate_aux_buf(ctx, &av1_dec->film_grain,
> + ALIGN(sizeof(struct hantro_av1_film_grain), 2048));
> + ret |= hantro_allocate_aux_buf(ctx, &av1_dec->prob_tbl,
> + ALIGN(sizeof(struct av1cdfs), 2048));
> + ret |= hantro_allocate_aux_buf(ctx, &av1_dec->prob_tbl_out,
> + ALIGN(sizeof(struct av1cdfs), 2048));
> + if (ret)
> + goto buffer_allocation_error;
> +
> av1_dec->cdfs = &av1_dec->default_cdfs;
> av1_dec->cdfs_ndvc = &av1_dec->default_cdfs_ndvc;
>
> hantro_av1_set_default_cdfs(av1_dec->cdfs, av1_dec->cdfs_ndvc);
>
> - av1_dec->tile_buf.cpu = dma_alloc_coherent(vpu->dev,
> - AV1_TILE_SIZE,
> - &av1_dec->tile_buf.dma,
> - GFP_KERNEL);
> - if (!av1_dec->tile_buf.cpu)
> - return -ENOMEM;
> - av1_dec->tile_buf.size = AV1_TILE_SIZE;
> -
> return 0;
> +
> +buffer_allocation_error:
> + hantro_free_aux_buf(ctx, &av1_dec->global_model);
> + hantro_free_aux_buf(ctx, &av1_dec->tile_info);
> + hantro_free_aux_buf(ctx, &av1_dec->film_grain);
> + hantro_free_aux_buf(ctx, &av1_dec->prob_tbl);
> + hantro_free_aux_buf(ctx, &av1_dec->prob_tbl_out);
> +
> + return -ENOMEM;
> }
>
> int hantro_av1_prepare_run(struct hantro_ctx *ctx)
[-- 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 21:59 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 [this message]
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
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=1839823f5991456eda0e6b447f3eac34a1cdd1cf.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®