diff options
| author |   Ezequiel Garcia <ezequiel@collabora.com> | 2020-07-27 19:05:37 +0200 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-09-01 14:13:25 +0200 |
| commit | 6d9e8cd0553bb03e8ab9d4d2d7d17f3fb639bd86 (patch) | |
| tree | e8f42d086aa8b21f70a69705580c7768f59ff1fa /drivers/staging/media/hantro/hantro_h264.c | |
| parent | tm6000: drop unnecessary list_empty (diff) | |
| download | linux-dev-6d9e8cd0553bb03e8ab9d4d2d7d17f3fb639bd86.tar.xz linux-dev-6d9e8cd0553bb03e8ab9d4d2d7d17f3fb639bd86.zip | |
media: hantro: h264: Get the correct fallback reference buffer
If the bitstream and the application are incorrectly configuring
the reference pictures, the hardware will need to fallback
to using some other reference picture.
When the post-processor is enabled, the fallback buffer
should be a shadow buffer (postproc.dec_q), and not a
CAPTURE queue buffer, since the latter is post-processed
and not really the output of the decoder core.
Fixes: 8c2d66b036c77 ("media: hantro: Support color conversion via post-processing")
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/hantro/hantro_h264.c')
| -rw-r--r-- | drivers/staging/media/hantro/hantro_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/hantro/hantro_h264.c b/drivers/staging/media/hantro/hantro_h264.c index 194d05848077..6dcd47bd9ed3 100644 --- a/drivers/staging/media/hantro/hantro_h264.c +++ b/drivers/staging/media/hantro/hantro_h264.c @@ -325,7 +325,7 @@ dma_addr_t hantro_h264_get_ref_buf(struct hantro_ctx *ctx, */ dst_buf = hantro_get_dst_buf(ctx); buf = &dst_buf->vb2_buf; - dma_addr = vb2_dma_contig_plane_dma_addr(buf, 0); + dma_addr = hantro_get_dec_buf_addr(ctx, buf); } return dma_addr; |