media: hantro: fix extra MV/MC sync space calculation

Add space for MVs and MC sync data to the capture buffers depending on
whether the post processor will be enabled for the new capture format
passed to TRY_FMT, not the currently set capture format.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c
index 0198bcda26b751175fd1975de873873f3a1a9e30..f4ae2cee0f189bf0674e680224d3d335a011186e 100644 (file)
--- a/drivers/staging/media/hantro/hantro_v4l2.c
+++ b/drivers/staging/media/hantro/hantro_v4l2.c
@@ -295,7 +295,7 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f,
                 * +---------------------------+
                 */
                if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_H264_SLICE &&
-                   !hantro_needs_postproc(ctx, ctx->vpu_dst_fmt))
+                   !hantro_needs_postproc(ctx, fmt))
                        pix_mp->plane_fmt[0].sizeimage +=
                                64 * MB_WIDTH(pix_mp->width) *
                                     MB_WIDTH(pix_mp->height) + 32;