From 448ea5ee473b9a41ec1235217648bd48096dfcf0 Mon Sep 17 00:00:00 2001

From: Nicolas Dufresne <nicolas.dufresne@collabora.com>

Date: Thu, 19 Aug 2021 16:00:09 +0200

Subject: [PATCH] media: cedrus: Fix SUNXI tile size calculation

Git-commit: 448ea5ee473b9a41ec1235217648bd48096dfcf0

Patch-mainline: v5.16-rc1

References: git-fixes

Tiled formats requires full rows being allocated (even for Chroma

planes). When the number of Luma tiles is odd, we need to round up

to twice the tile width in order to roundup the number of Chroma

tiles.

This was notice with a crash running BA1_FT_C compliance test using

sunxi tiles using GStreamer. Cedrus driver would allocate 9 rows for

Luma, but only 4.5 rows for Chroma, causing userspace to crash.

Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

Fixes: 50e761516f2b8 ("media: platform: Add Cedrus VPU decoder driver")

Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/staging/media/sunxi/cedrus/cedrus_video.c |    2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c

+++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c

@@ -150,7 +150,7 @@ void cedrus_prepare_format(struct v4l2_p

 		sizeimage = bytesperline * height;

 		/* Chroma plane size. */

-		sizeimage += bytesperline * height / 2;

+		sizeimage += bytesperline * ALIGN(height, 64) / 2;

 		break;

 	}