media: mt9m111: make SUBDEV_G_FMT ioctl work with SUBDEV_FORMAT_TRY

The VIDIOC_SUBDEV_G_FMT ioctl for this driver doesn't recognize
V4L2_SUBDEV_FORMAT_TRY and always works as if V4L2_SUBDEV_FORMAT_ACTIVE
is specified.

Cc: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
Cc: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
index d639b9bcf64a8ced3e0fe19a6f1c49ed70982bb9..63a5253a33768d35963aa620b2a4e3333104cb2d 100644 (file)
--- a/drivers/media/i2c/mt9m111.c
+++ b/drivers/media/i2c/mt9m111.c
@@ -528,6 +528,16 @@ static int mt9m111_get_fmt(struct v4l2_subdev *sd,
        if (format->pad)
                return -EINVAL;
 
+       if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
+               mf = v4l2_subdev_get_try_format(sd, cfg, format->pad);
+               format->format = *mf;
+               return 0;
+#else
+               return -ENOTTY;
+#endif
+       }
+
        mf->width       = mt9m111->width;
        mf->height      = mt9m111->height;
        mf->code        = mt9m111->fmt->code;
@@ -1089,6 +1099,25 @@ static int mt9m111_s_stream(struct v4l2_subdev *sd, int enable)
        return 0;
 }
 
+static int mt9m111_init_cfg(struct v4l2_subdev *sd,
+                           struct v4l2_subdev_pad_config *cfg)
+{
+#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
+       struct v4l2_mbus_framefmt *format =
+               v4l2_subdev_get_try_format(sd, cfg, 0);
+
+       format->width   = MT9M111_MAX_WIDTH;
+       format->height  = MT9M111_MAX_HEIGHT;
+       format->code    = mt9m111_colour_fmts[0].code;
+       format->colorspace      = mt9m111_colour_fmts[0].colorspace;
+       format->field   = V4L2_FIELD_NONE;
+       format->ycbcr_enc       = V4L2_YCBCR_ENC_DEFAULT;
+       format->quantization    = V4L2_QUANTIZATION_DEFAULT;
+       format->xfer_func       = V4L2_XFER_FUNC_DEFAULT;
+#endif
+       return 0;
+}
+
 static int mt9m111_g_mbus_config(struct v4l2_subdev *sd,
                                struct v4l2_mbus_config *cfg)
 {
@@ -1114,6 +1143,7 @@ static const struct v4l2_subdev_video_ops mt9m111_subdev_video_ops = {
 };
 
 static const struct v4l2_subdev_pad_ops mt9m111_subdev_pad_ops = {
+       .init_cfg       = mt9m111_init_cfg,
        .enum_mbus_code = mt9m111_enum_mbus_code,
        .get_selection  = mt9m111_get_selection,
        .set_selection  = mt9m111_set_selection,