| Message ID | 20200524192505.20682-9-andrey.konovalov@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Improvements to IMX290 CMOS driver | expand |
Hi Andrey, On Sun, May 24, 2020 at 10:25:03PM +0300, Andrey Konovalov wrote: > From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > Add support to enumerate all frame sizes supported by IMX290. This is > required for using with userspace tools such as libcamera. > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org> > --- > drivers/media/i2c/imx290.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c > index 6e70ff22bc5f..88850f3b1427 100644 > --- a/drivers/media/i2c/imx290.c > +++ b/drivers/media/i2c/imx290.c > @@ -471,6 +471,25 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd, > return 0; > } > > +static int imx290_enum_frame_size(struct v4l2_subdev *subdev, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_frame_size_enum *fse) > +{ > + if ((fse->code != imx290_formats[0].code) && > + (fse->code != imx290_formats[1].code)) > + return -EINVAL; Please skip the modes that do not have the code specified by the user. They should not be enumerated here. > + > + if (fse->index >= ARRAY_SIZE(imx290_modes)) > + return -EINVAL; > + > + fse->min_width = imx290_modes[fse->index].width; > + fse->max_width = imx290_modes[fse->index].width; > + fse->min_height = imx290_modes[fse->index].height; > + fse->max_height = imx290_modes[fse->index].height; > + > + return 0; > +} > + > static int imx290_get_fmt(struct v4l2_subdev *sd, > struct v4l2_subdev_pad_config *cfg, > struct v4l2_subdev_format *fmt) > @@ -850,6 +869,7 @@ static const struct v4l2_subdev_video_ops imx290_video_ops = { > static const struct v4l2_subdev_pad_ops imx290_pad_ops = { > .init_cfg = imx290_entity_init_cfg, > .enum_mbus_code = imx290_enum_mbus_code, > + .enum_frame_size = imx290_enum_frame_size, > .get_fmt = imx290_get_fmt, > .set_fmt = imx290_set_fmt, > };
Hi Sakari, Thank you for the review! On 26.05.2020 12:17, Sakari Ailus wrote: > Hi Andrey, > > On Sun, May 24, 2020 at 10:25:03PM +0300, Andrey Konovalov wrote: >> From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> >> >> Add support to enumerate all frame sizes supported by IMX290. This is >> required for using with userspace tools such as libcamera. >> >> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> >> Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org> >> --- >> drivers/media/i2c/imx290.c | 20 ++++++++++++++++++++ >> 1 file changed, 20 insertions(+) >> >> diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c >> index 6e70ff22bc5f..88850f3b1427 100644 >> --- a/drivers/media/i2c/imx290.c >> +++ b/drivers/media/i2c/imx290.c >> @@ -471,6 +471,25 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd, >> return 0; >> } >> >> +static int imx290_enum_frame_size(struct v4l2_subdev *subdev, >> + struct v4l2_subdev_pad_config *cfg, >> + struct v4l2_subdev_frame_size_enum *fse) >> +{ >> + if ((fse->code != imx290_formats[0].code) && >> + (fse->code != imx290_formats[1].code)) >> + return -EINVAL; > > Please skip the modes that do not have the code specified by the user. They > should not be enumerated here. I've double checked this part of the code, and it doesn't seem to need changes. The reason is that for the both codes the set of the modes and the frame sizes is exactly the same. And the fse->code check above just guards against the codes not supported by the driver at all. Thanks, Andrey >> + >> + if (fse->index >= ARRAY_SIZE(imx290_modes)) >> + return -EINVAL; >> + >> + fse->min_width = imx290_modes[fse->index].width; >> + fse->max_width = imx290_modes[fse->index].width; >> + fse->min_height = imx290_modes[fse->index].height; >> + fse->max_height = imx290_modes[fse->index].height; >> + >> + return 0; >> +} >> + >> static int imx290_get_fmt(struct v4l2_subdev *sd, >> struct v4l2_subdev_pad_config *cfg, >> struct v4l2_subdev_format *fmt) >> @@ -850,6 +869,7 @@ static const struct v4l2_subdev_video_ops imx290_video_ops = { >> static const struct v4l2_subdev_pad_ops imx290_pad_ops = { >> .init_cfg = imx290_entity_init_cfg, >> .enum_mbus_code = imx290_enum_mbus_code, >> + .enum_frame_size = imx290_enum_frame_size, >> .get_fmt = imx290_get_fmt, >> .set_fmt = imx290_set_fmt, >> }; >
On Sun, Jun 07, 2020 at 07:28:56PM +0300, Andrey Konovalov wrote: > Hi Sakari, > > Thank you for the review! > > On 26.05.2020 12:17, Sakari Ailus wrote: > > Hi Andrey, > > > > On Sun, May 24, 2020 at 10:25:03PM +0300, Andrey Konovalov wrote: > > > From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > > > > > Add support to enumerate all frame sizes supported by IMX290. This is > > > required for using with userspace tools such as libcamera. > > > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > > Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org> > > > --- > > > drivers/media/i2c/imx290.c | 20 ++++++++++++++++++++ > > > 1 file changed, 20 insertions(+) > > > > > > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c > > > index 6e70ff22bc5f..88850f3b1427 100644 > > > --- a/drivers/media/i2c/imx290.c > > > +++ b/drivers/media/i2c/imx290.c > > > @@ -471,6 +471,25 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd, > > > return 0; > > > } > > > +static int imx290_enum_frame_size(struct v4l2_subdev *subdev, > > > + struct v4l2_subdev_pad_config *cfg, > > > + struct v4l2_subdev_frame_size_enum *fse) > > > +{ > > > + if ((fse->code != imx290_formats[0].code) && > > > + (fse->code != imx290_formats[1].code)) > > > + return -EINVAL; > > > > Please skip the modes that do not have the code specified by the user. They > > should not be enumerated here. > > I've double checked this part of the code, and it doesn't seem to need changes. > The reason is that for the both codes the set of the modes and the frame sizes is > exactly the same. And the fse->code check above just guards against the codes not > supported by the driver at all. Indeed. Please then ignore the comment.
diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c index 6e70ff22bc5f..88850f3b1427 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -471,6 +471,25 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd, return 0; } +static int imx290_enum_frame_size(struct v4l2_subdev *subdev, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_frame_size_enum *fse) +{ + if ((fse->code != imx290_formats[0].code) && + (fse->code != imx290_formats[1].code)) + return -EINVAL; + + if (fse->index >= ARRAY_SIZE(imx290_modes)) + return -EINVAL; + + fse->min_width = imx290_modes[fse->index].width; + fse->max_width = imx290_modes[fse->index].width; + fse->min_height = imx290_modes[fse->index].height; + fse->max_height = imx290_modes[fse->index].height; + + return 0; +} + static int imx290_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_format *fmt) @@ -850,6 +869,7 @@ static const struct v4l2_subdev_video_ops imx290_video_ops = { static const struct v4l2_subdev_pad_ops imx290_pad_ops = { .init_cfg = imx290_entity_init_cfg, .enum_mbus_code = imx290_enum_mbus_code, + .enum_frame_size = imx290_enum_frame_size, .get_fmt = imx290_get_fmt, .set_fmt = imx290_set_fmt, };