From fbf9aa6aeaebb10afb9d4fca013c4823ae0b5101 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 8 Jan 2019 15:20:16 -0200 Subject: [PATCH] media: coda: use macroblock tiling on CODA960 only Coda7541 and earlier do not support macroblock tiling. They do support the NV12 format, though. Enable macroblock tiling for NV12 only on CODA960. This fixes crashes when trying to use NV12 support on CodaHx4. Signed-off-by: Philipp Zabel Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/coda/coda-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index 390d1ce6ab32..fa0b22fb7991 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -728,7 +728,7 @@ static int coda_s_fmt(struct coda_ctx *ctx, struct v4l2_format *f, ctx->tiled_map_type = GDI_TILED_FRAME_MB_RASTER_MAP; break; case V4L2_PIX_FMT_NV12: - if (!disable_tiling) { + if (!disable_tiling && ctx->dev->devtype->product == CODA_960) { ctx->tiled_map_type = GDI_TILED_FRAME_MB_RASTER_MAP; break; } -- 2.30.2