[v4,2/3] media: ov7670: Add the get_fmt callback
Commit Message
Add the get_fmt callback, also enable V4L2_SUBDEV_FL_HAS_DEVNODE flag
to make this subdev has device node.
Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
---
Changes in v4:
- Fix the build error when not enabling V4L2 sub-device userspace API option.
Changes in v3:
- Keep tried format info in the try_fmt member of
v4l2_subdev__pad_config struct.
- Add the internal_ops callback to set default format.
Changes in v2: None
drivers/media/i2c/ov7670.c | 75 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 74 insertions(+), 1 deletion(-)
Comments
Hi Wenyou,
[auto build test WARNING on linuxtv-media/master]
[also build test WARNING on v4.14-rc1 next-20170918]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Wenyou-Yang/media-ov7670-Add-entity-init-and-power-operation/20170918-145527
base: git://linuxtv.org/media_tree.git master
config: x86_64-randconfig-x003-201738 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All warnings (new ones prefixed by >>):
drivers/media/i2c/ov7670.c: In function 'ov7670_set_fmt':
>> drivers/media/i2c/ov7670.c:1006:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
struct v4l2_mbus_framefmt *mbus_fmt;
^~~~~~
vim +1006 drivers/media/i2c/ov7670.c
984
985 /*
986 * Set a format.
987 */
988 static int ov7670_set_fmt(struct v4l2_subdev *sd,
989 struct v4l2_subdev_pad_config *cfg,
990 struct v4l2_subdev_format *format)
991 {
992 struct ov7670_format_struct *ovfmt;
993 struct ov7670_win_size *wsize;
994 struct ov7670_info *info = to_state(sd);
995 unsigned char com7;
996 int ret;
997
998 if (format->pad)
999 return -EINVAL;
1000
1001 if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
1002 ret = ov7670_try_fmt_internal(sd, &format->format, NULL, NULL);
1003 if (ret)
1004 return ret;
1005 #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
> 1006 struct v4l2_mbus_framefmt *mbus_fmt;
1007
1008 mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
1009 *mbus_fmt = format->format;
1010 return 0;
1011 #else
1012 return -ENOTTY;
1013 #endif
1014 }
1015
1016 ret = ov7670_try_fmt_internal(sd, &format->format, &ovfmt, &wsize);
1017
1018 if (ret)
1019 return ret;
1020 /*
1021 * COM7 is a pain in the ass, it doesn't like to be read then
1022 * quickly written afterward. But we have everything we need
1023 * to set it absolutely here, as long as the format-specific
1024 * register sets list it first.
1025 */
1026 com7 = ovfmt->regs[0].value;
1027 com7 |= wsize->com7_bit;
1028 ov7670_write(sd, REG_COM7, com7);
1029 /*
1030 * Now write the rest of the array. Also store start/stops
1031 */
1032 ov7670_write_array(sd, ovfmt->regs + 1);
1033 ov7670_set_hw(sd, wsize->hstart, wsize->hstop, wsize->vstart,
1034 wsize->vstop);
1035 ret = 0;
1036 if (wsize->regs)
1037 ret = ov7670_write_array(sd, wsize->regs);
1038 info->fmt = ovfmt;
1039
1040 /*
1041 * If we're running RGB565, we must rewrite clkrc after setting
1042 * the other parameters or the image looks poor. If we're *not*
1043 * doing RGB565, we must not rewrite clkrc or the image looks
1044 * *really* poor.
1045 *
1046 * (Update) Now that we retain clkrc state, we should be able
1047 * to write it unconditionally, and that will make the frame
1048 * rate persistent too.
1049 */
1050 if (ret == 0)
1051 ret = ov7670_write(sd, REG_CLKRC, info->clkrc);
1052 return 0;
1053 }
1054
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Wenyou,
On Mon, Sep 18, 2017 at 02:45:13PM +0800, Wenyou Yang wrote:
> @@ -998,8 +1002,15 @@ static int ov7670_set_fmt(struct v4l2_subdev *sd,
> ret = ov7670_try_fmt_internal(sd, &format->format, NULL, NULL);
> if (ret)
> return ret;
> - cfg->try_fmt = format->format;
> +#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
> + struct v4l2_mbus_framefmt *mbus_fmt;
This will emit a compiler warning at least.
> +
> + mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
> + *mbus_fmt = format->format;
> return 0;
> +#else
> + return -ENOTTY;
> +#endif
> }
>
> ret = ov7670_try_fmt_internal(sd, &format->format, &ovfmt, &wsize);
Hi Sakari,
On 2017/9/18 15:36, Sakari Ailus wrote:
> Hi Wenyou,
>
> On Mon, Sep 18, 2017 at 02:45:13PM +0800, Wenyou Yang wrote:
>> @@ -998,8 +1002,15 @@ static int ov7670_set_fmt(struct v4l2_subdev *sd,
>> ret = ov7670_try_fmt_internal(sd, &format->format, NULL, NULL);
>> if (ret)
>> return ret;
>> - cfg->try_fmt = format->format;
>> +#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>> + struct v4l2_mbus_framefmt *mbus_fmt;
> This will emit a compiler warning at least.
Thank you for your review.
Will be fixed in next version.
>
>> +
>> + mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
>> + *mbus_fmt = format->format;
>> return 0;
>> +#else
>> + return -ENOTTY;
>> +#endif
>> }
>>
>> ret = ov7670_try_fmt_internal(sd, &format->format, &ovfmt, &wsize);
Best Regards,
Wenyou Yang
@@ -232,6 +232,7 @@ struct ov7670_info {
struct v4l2_ctrl *saturation;
struct v4l2_ctrl *hue;
};
+ struct v4l2_mbus_framefmt format;
struct ov7670_format_struct *fmt; /* Current format */
struct clk *clk;
struct gpio_desc *resetb_gpio;
@@ -975,6 +976,9 @@ static int ov7670_try_fmt_internal(struct v4l2_subdev *sd,
fmt->width = wsize->width;
fmt->height = wsize->height;
fmt->colorspace = ov7670_formats[index].colorspace;
+
+ info->format = *fmt;
+
return 0;
}
@@ -998,8 +1002,15 @@ static int ov7670_set_fmt(struct v4l2_subdev *sd,
ret = ov7670_try_fmt_internal(sd, &format->format, NULL, NULL);
if (ret)
return ret;
- cfg->try_fmt = format->format;
+#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
+ struct v4l2_mbus_framefmt *mbus_fmt;
+
+ mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
+ *mbus_fmt = format->format;
return 0;
+#else
+ return -ENOTTY;
+#endif
}
ret = ov7670_try_fmt_internal(sd, &format->format, &ovfmt, &wsize);
@@ -1041,6 +1052,29 @@ static int ov7670_set_fmt(struct v4l2_subdev *sd,
return 0;
}
+static int ov7670_get_fmt(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *format)
+{
+ struct ov7670_info *info = to_state(sd);
+
+ if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
+ struct v4l2_mbus_framefmt *mbus_fmt;
+
+ mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, 0);
+ format->format = *mbus_fmt;
+ return 0;
+#else
+ return -ENOTTY;
+#endif
+ } else {
+ format->format = info->format;
+ }
+
+ return 0;
+}
+
/*
* Implement G/S_PARM. There is a "high quality" mode we could try
* to do someday; for now, we just do the frame rate tweak.
@@ -1508,6 +1542,30 @@ static int ov7670_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regis
}
#endif
+static void ov7670_get_default_format(struct v4l2_subdev *sd,
+ struct v4l2_mbus_framefmt *format)
+{
+ struct ov7670_info *info = to_state(sd);
+
+ format->width = info->devtype->win_sizes[0].width;
+ format->height = info->devtype->win_sizes[0].height;
+ format->colorspace = info->fmt->colorspace;
+ format->code = info->fmt->mbus_code;
+ format->field = V4L2_FIELD_NONE;
+}
+
+#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
+static int ov7670_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+{
+ struct v4l2_mbus_framefmt *format =
+ v4l2_subdev_get_try_format(sd, fh->pad, 0);
+
+ ov7670_get_default_format(sd, format);
+
+ return 0;
+}
+#endif
+
/* ----------------------------------------------------------------------- */
static const struct v4l2_subdev_core_ops ov7670_core_ops = {
@@ -1528,6 +1586,7 @@ static const struct v4l2_subdev_pad_ops ov7670_pad_ops = {
.enum_frame_interval = ov7670_enum_frame_interval,
.enum_frame_size = ov7670_enum_frame_size,
.enum_mbus_code = ov7670_enum_mbus_code,
+ .get_fmt = ov7670_get_fmt,
.set_fmt = ov7670_set_fmt,
};
@@ -1537,6 +1596,12 @@ static const struct v4l2_subdev_ops ov7670_ops = {
.pad = &ov7670_pad_ops,
};
+#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
+static const struct v4l2_subdev_internal_ops ov7670_subdev_internal_ops = {
+ .open = ov7670_open,
+};
+#endif
+
/* ----------------------------------------------------------------------- */
static const struct ov7670_devtype ov7670_devdata[] = {
@@ -1589,6 +1654,11 @@ static int ov7670_probe(struct i2c_client *client,
sd = &info->sd;
v4l2_i2c_subdev_init(sd, client, &ov7670_ops);
+#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
+ sd->internal_ops = &ov7670_subdev_internal_ops;
+ sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+#endif
+
info->clock_speed = 30; /* default: a guess */
if (client->dev.platform_data) {
struct ov7670_config *config = client->dev.platform_data;
@@ -1645,6 +1715,9 @@ static int ov7670_probe(struct i2c_client *client,
info->devtype = &ov7670_devdata[id->driver_data];
info->fmt = &ov7670_formats[0];
+
+ ov7670_get_default_format(sd, &info->format);
+
info->clkrc = 0;
/* Set default frame rate to 30 fps */