aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2019-11-10 07:26:11 +0100
committerMauro Carvalho Chehab <mchehab@kernel.org>2019-11-10 07:26:11 +0100
commitff1c21f4cffdd490f2d7fd1ce28462e3dca610de (patch)
tree274430281f0d5bbb21f206b6d4b4a258919bc325 /drivers/media
parentmedia: mtk-vcodec: Remove extra area allocation in an input buffer on encoding (diff)
downloadlinux-dev-ff1c21f4cffdd490f2d7fd1ce28462e3dca610de.tar.xz
linux-dev-ff1c21f4cffdd490f2d7fd1ce28462e3dca610de.zip
media: coda: disable encoder compose selections
Disable capture side compose selections for the encoder. This fixes the following v4l2-compliance complaint: fail: v4l2-test-formats.cpp(1662): IS_ENCODER(node) test Composing: FAIL 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@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/coda/coda-common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 5a38808c8695..af6c59e05138 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -942,7 +942,8 @@ static int coda_g_selection(struct file *file, void *fh,
/* fallthrough */
case V4L2_SEL_TGT_COMPOSE:
case V4L2_SEL_TGT_COMPOSE_DEFAULT:
- if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+ ctx->inst_type == CODA_INST_ENCODER)
return -EINVAL;
break;
default: