Skip to content

Commit

Permalink
media: hantro: h264: Get the correct fallback reference buffer
Browse files Browse the repository at this point in the history
[ Upstream commit 6d9e8cd ]

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: 8c2d66b ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
ezequielgarcia authored and gregkh committed Oct 29, 2020
1 parent b076e6a commit 841d6b2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/staging/media/hantro/hantro_h264.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,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;
Expand Down

0 comments on commit 841d6b2

Please sign in to comment.