summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/hantro/hantro_g1_h264_dec.c
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel@collabora.com>2019-12-05 15:24:43 +0100
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2019-12-16 10:28:39 +0100
commit8c2d66b036c778480787e395097e0d04bc383db4 (patch)
tree0b6163ffa2b3182be77a3b30dc56a5a0470b05ed /drivers/staging/media/hantro/hantro_g1_h264_dec.c
parent3143f8a123dc6ecbe1f39e92fb1081e49a1c7bf1 (diff)
downloadlinux-stable-8c2d66b036c778480787e395097e0d04bc383db4.tar.gz
linux-stable-8c2d66b036c778480787e395097e0d04bc383db4.tar.bz2
linux-stable-8c2d66b036c778480787e395097e0d04bc383db4.zip
media: hantro: Support color conversion via post-processing
The Hantro G1 decoder is able to enable a post-processor on the decoding pipeline, which can be used to perform scaling and color conversion. The post-processor is integrated to the decoder, and it's possible to use it in a way that is completely transparent to the user. This commit enables color conversion via post-processing, which means the driver now exposes YUV packed, in addition to NV12. Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> 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_g1_h264_dec.c')
-rw-r--r--drivers/staging/media/hantro/hantro_g1_h264_dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
index 887dc5210447..424c648ce9fc 100644
--- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c
+++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
@@ -244,7 +244,7 @@ static void set_buffers(struct hantro_ctx *ctx)
vdpu_write_relaxed(vpu, src_dma, G1_REG_ADDR_STR);
/* Destination (decoded frame) buffer. */
- dst_dma = vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
+ dst_dma = hantro_get_dec_buf_addr(ctx, &dst_buf->vb2_buf);
/* Adjust dma addr to start at second line for bottom field */
if (ctrls->slices[0].flags & V4L2_H264_SLICE_FLAG_BOTTOM_FIELD)
offset = ALIGN(ctx->src_fmt.width, MB_DIM);