media: ov2640: make VIDIOC_SUBDEV_G_FMT ioctl work with V4L2_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.

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/ov2640.c b/drivers/media/i2c/ov2640.c
index 1fd893b..d3f10d9 100644 (file)
--- a/drivers/media/i2c/ov2640.c
+++ b/drivers/media/i2c/ov2640.c
@@ -926,6 +926,15 @@ static int ov2640_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, 0);
+               format->format = *mf;
+               return 0;
+#else
+               return -ENOTTY;
+#endif
+       }
 
        mf->width       = priv->win->width;
        mf->height      = priv->win->height;
@@ -992,6 +1001,27 @@ out:
        return ret;
 }
 
+static int ov2640_init_cfg(struct v4l2_subdev *sd,
+                          struct v4l2_subdev_pad_config *cfg)
+{
+#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+       struct ov2640_priv *priv = to_ov2640(client);
+       struct v4l2_mbus_framefmt *try_fmt =
+               v4l2_subdev_get_try_format(sd, cfg, 0);
+
+       try_fmt->width = priv->win->width;
+       try_fmt->height = priv->win->height;
+       try_fmt->code = priv->cfmt_code;
+       try_fmt->colorspace = V4L2_COLORSPACE_SRGB;
+       try_fmt->field = V4L2_FIELD_NONE;
+       try_fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
+       try_fmt->quantization = V4L2_QUANTIZATION_DEFAULT;
+       try_fmt->xfer_func = V4L2_XFER_FUNC_DEFAULT;
+#endif
+       return 0;
+}
+
 static int ov2640_enum_mbus_code(struct v4l2_subdev *sd,
                struct v4l2_subdev_pad_config *cfg,
                struct v4l2_subdev_mbus_code_enum *code)
@@ -1101,6 +1131,7 @@ static const struct v4l2_subdev_core_ops ov2640_subdev_core_ops = {
 };
 
 static const struct v4l2_subdev_pad_ops ov2640_subdev_pad_ops = {
+       .init_cfg       = ov2640_init_cfg,
        .enum_mbus_code = ov2640_enum_mbus_code,
        .get_selection  = ov2640_get_selection,
        .get_fmt        = ov2640_get_fmt,