Commit ea755701 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Mauro Carvalho Chehab
Browse files

media: cedrus: h264: Fix 4K decoding on H6 



Due to unknown reason, H6 needs larger intraprediction buffer for 4K
videos than other SoCs. This was discovered by playing 4096x2304 video,
which is maximum what H6 VPU is supposed to support.

Fixes: 03e612e7 ("media: cedrus: Fix H264 4k support")
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent af72bc8c

drivers/staging/media/sunxi/cedrus/cedrus_h264.c

+5 −1
Original line number Diff line number Diff line
@@ -610,8 +610,12 @@ static int cedrus_h264_start(struct cedrus_ctx *ctx) 
			goto err_mv_col_buf;

		}



		/*

		 * NOTE: Multiplying by two deviates from CedarX logic, but it

		 * is for some unknown reason needed for H264 4K decoding on H6.

		 */

		ctx->codec.h264.intra_pred_buf_size =

			ALIGN(ctx->src_fmt.width, 64) * 5;

			ALIGN(ctx->src_fmt.width, 64) * 5 * 2;

		ctx->codec.h264.intra_pred_buf =

			dma_alloc_coherent(dev->dev,

					   ctx->codec.h264.intra_pred_buf_size,