aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/coda/coda-common.c
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2019-01-08 12:20:16 -0500
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-01-21 12:46:50 -0500
commitfbf9aa6aeaebb10afb9d4fca013c4823ae0b5101 (patch)
tree9537b13b209bc12292e28d6255e935455de08a1d /drivers/media/platform/coda/coda-common.c
parent0a44baa4e9959d67b01b24a38b90dd903f89a0b6 (diff)
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 <p.zabel@pengutronix.de> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/coda/coda-common.c')
-rw-r--r--drivers/media/platform/coda/coda-common.c2
1 files changed, 1 insertions, 1 deletions
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,
728 ctx->tiled_map_type = GDI_TILED_FRAME_MB_RASTER_MAP; 728 ctx->tiled_map_type = GDI_TILED_FRAME_MB_RASTER_MAP;
729 break; 729 break;
730 case V4L2_PIX_FMT_NV12: 730 case V4L2_PIX_FMT_NV12:
731 if (!disable_tiling) { 731 if (!disable_tiling && ctx->dev->devtype->product == CODA_960) {
732 ctx->tiled_map_type = GDI_TILED_FRAME_MB_RASTER_MAP; 732 ctx->tiled_map_type = GDI_TILED_FRAME_MB_RASTER_MAP;
733 break; 733 break;
734 } 734 }