Commit dca6b373 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: Revert "media: mtk-vcodec: Remove extra area allocation in an input buffer on encoding" 



This reverts commit 3192b2ca.

There are indications that this patch causes problems on some
platforms due to some hardware prefetch. Reverting this patch
for now until this is better understood.

Reported-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent a2cbf80a

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c

+6 −3
Original line number Diff line number Diff line
@@ -332,12 +332,14 @@ static int vidioc_try_fmt(struct v4l2_format *f, 


		pix_fmt_mp->num_planes = fmt->num_planes;

		pix_fmt_mp->plane_fmt[0].sizeimage =

			pix_fmt_mp->width * pix_fmt_mp->height;

				pix_fmt_mp->width * pix_fmt_mp->height +

				((ALIGN(pix_fmt_mp->width, 16) * 2) * 16);

		pix_fmt_mp->plane_fmt[0].bytesperline = pix_fmt_mp->width;



		if (pix_fmt_mp->num_planes == 2) {

			pix_fmt_mp->plane_fmt[1].sizeimage =

				(pix_fmt_mp->width * pix_fmt_mp->height) / 2;

				(pix_fmt_mp->width * pix_fmt_mp->height) / 2 +

				(ALIGN(pix_fmt_mp->width, 16) * 16);

			pix_fmt_mp->plane_fmt[2].sizeimage = 0;

			pix_fmt_mp->plane_fmt[1].bytesperline =

							pix_fmt_mp->width;
@@ -345,7 +347,8 @@ static int vidioc_try_fmt(struct v4l2_format *f, 
		} else if (pix_fmt_mp->num_planes == 3) {

			pix_fmt_mp->plane_fmt[1].sizeimage =

			pix_fmt_mp->plane_fmt[2].sizeimage =

				(pix_fmt_mp->width * pix_fmt_mp->height) / 4;

				(pix_fmt_mp->width * pix_fmt_mp->height) / 4 +

				((ALIGN(pix_fmt_mp->width, 16) / 2) * 16);

			pix_fmt_mp->plane_fmt[1].bytesperline =

				pix_fmt_mp->plane_fmt[2].bytesperline =

				pix_fmt_mp->width / 2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE