media: coda: V4L2_PIX_FMT_GREY for coda960 JPEG Encoder

support greyscale pix fmt input for coda9_jpeg_encoder. The hardware
supports it, so allow V4L2 Mem2Mem JPEG Encoder use it as well. Tested
on an i.MX6QP.

[hverkuil: updated the Subject line as suggested by Philipp]

Signed-off-by: Martin Weber <martin.weber@br-automation.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 0e312b0..3cfd436 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -43,7 +43,7 @@
 #define CODA_NAME              "coda"
 
 #define CODADX6_MAX_INSTANCES  4
-#define CODA_MAX_FORMATS       4
+#define CODA_MAX_FORMATS       5
 
 #define CODA_ISRAM_SIZE        (2048 * 2)
 
@@ -247,6 +247,7 @@ static const struct coda_video_device coda9_jpeg_encoder = {
                V4L2_PIX_FMT_YUV420,
                V4L2_PIX_FMT_YVU420,
                V4L2_PIX_FMT_YUV422P,
+               V4L2_PIX_FMT_GREY,
        },
        .dst_formats = {
                V4L2_PIX_FMT_JPEG,
@@ -626,6 +627,11 @@ static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec,
                f->fmt.pix.sizeimage = f->fmt.pix.bytesperline *
                                        f->fmt.pix.height * 2;
                break;
+       case V4L2_PIX_FMT_GREY:
+               /* keep 16 pixel alignment of 8-bit pixel data */
+               f->fmt.pix.bytesperline = round_up(f->fmt.pix.width, 16);
+               f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * f->fmt.pix.height;
+               break;
        case V4L2_PIX_FMT_JPEG:
        case V4L2_PIX_FMT_H264:
        case V4L2_PIX_FMT_MPEG4: