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 Reviewed-by: Nicolas Dufresne > --- > .../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); > }