lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 110/633] media: hantro: h264: Get the correct fallback reference buffer
    Date
    From: Ezequiel Garcia <ezequiel@collabora.com>

    [ Upstream commit 6d9e8cd0553bb03e8ab9d4d2d7d17f3fb639bd86 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/media/hantro/hantro_h264.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/staging/media/hantro/hantro_h264.c b/drivers/staging/media/hantro/hantro_h264.c
    index d561f125085a7..d72ebbd17a692 100644
    --- a/drivers/staging/media/hantro/hantro_h264.c
    +++ b/drivers/staging/media/hantro/hantro_h264.c
    @@ -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;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:29    [W:5.176 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site