| Message ID | 20250305061309.17911-2-tarang.raval@siliconsignals.io (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | media: i2c: imx219: Minor improvements for runtime PM and stream handling | expand |
Quoting Tarang Raval (2025-03-05 06:13:08) > Switch from s_stream to enable_streams and disable_streams callbacks. > > Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io> > --- > drivers/media/i2c/imx219.c | 43 +++++++++++++++----------------------- > 1 file changed, 17 insertions(+), 26 deletions(-) > > diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c > index f662c9d75511..75d3123d47b4 100644 > --- a/drivers/media/i2c/imx219.c > +++ b/drivers/media/i2c/imx219.c > @@ -723,12 +723,17 @@ static int imx219_configure_lanes(struct imx219 *imx219) > ARRAY_SIZE(imx219_4lane_regs), NULL); > }; > > -static int imx219_start_streaming(struct imx219 *imx219, > - struct v4l2_subdev_state *state) > +static int imx219_enable_streams(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *state, u32 pad, > + u64 streams_mask) > { > + struct imx219 *imx219 = to_imx219(sd); > struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); > int ret; > > + if (pad != 0) > + return -EINVAL; > + > ret = pm_runtime_resume_and_get(&client->dev); > if (ret < 0) > return ret; > @@ -767,10 +772,6 @@ static int imx219_start_streaming(struct imx219 *imx219, > if (ret) > goto err_rpm_put; > > - /* vflip and hflip cannot change during streaming */ > - __v4l2_ctrl_grab(imx219->vflip, true); > - __v4l2_ctrl_grab(imx219->hflip, true); > - Why do you drop these lines? It's not mentioned in the commit message. Are these handled somewhere else now ? -- Kieran > return 0; > > err_rpm_put: > @@ -778,37 +779,25 @@ static int imx219_start_streaming(struct imx219 *imx219, > return ret; > } > > -static void imx219_stop_streaming(struct imx219 *imx219) > +static int imx219_disable_streams(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *state, u32 pad, > + u64 streams_mask) > { > + struct imx219 *imx219 = to_imx219(sd); > struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); > int ret; > > + if (pad != 0) > + return -EINVAL; > + > /* set stream off register */ > ret = cci_write(imx219->regmap, IMX219_REG_MODE_SELECT, > IMX219_MODE_STANDBY, NULL); > if (ret) > dev_err(&client->dev, "%s failed to set stream\n", __func__); > > - __v4l2_ctrl_grab(imx219->vflip, false); > - __v4l2_ctrl_grab(imx219->hflip, false); > - > pm_runtime_put(&client->dev); > -} > - > -static int imx219_set_stream(struct v4l2_subdev *sd, int enable) > -{ > - struct imx219 *imx219 = to_imx219(sd); > - struct v4l2_subdev_state *state; > - int ret = 0; > - > - state = v4l2_subdev_lock_and_get_active_state(sd); > - > - if (enable) > - ret = imx219_start_streaming(imx219, state); > - else > - imx219_stop_streaming(imx219); > > - v4l2_subdev_unlock_state(state); > return ret; > } > > @@ -992,7 +981,7 @@ static int imx219_init_state(struct v4l2_subdev *sd, > } > > static const struct v4l2_subdev_video_ops imx219_video_ops = { > - .s_stream = imx219_set_stream, > + .s_stream = v4l2_subdev_s_stream_helper, > }; > > static const struct v4l2_subdev_pad_ops imx219_pad_ops = { > @@ -1001,6 +990,8 @@ static const struct v4l2_subdev_pad_ops imx219_pad_ops = { > .set_fmt = imx219_set_pad_format, > .get_selection = imx219_get_selection, > .enum_frame_size = imx219_enum_frame_size, > + .enable_streams = imx219_enable_streams, > + .disable_streams = imx219_disable_streams, > }; > > static const struct v4l2_subdev_ops imx219_subdev_ops = { > -- > 2.34.1 >
Hi Kieran, > Quoting Tarang Raval (2025-03-05 06:13:08) > > Switch from s_stream to enable_streams and disable_streams callbacks. > > > > Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io> > > --- > > drivers/media/i2c/imx219.c | 43 +++++++++++++++----------------------- > > 1 file changed, 17 insertions(+), 26 deletions(-) > > > > diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c > > index f662c9d75511..75d3123d47b4 100644 > > --- a/drivers/media/i2c/imx219.c > > +++ b/drivers/media/i2c/imx219.c > > @@ -723,12 +723,17 @@ static int imx219_configure_lanes(struct imx219 *imx219) > > ARRAY_SIZE(imx219_4lane_regs), NULL); > > }; > > > > -static int imx219_start_streaming(struct imx219 *imx219, > > - struct v4l2_subdev_state *state) > > +static int imx219_enable_streams(struct v4l2_subdev *sd, > > + struct v4l2_subdev_state *state, u32 pad, > > + u64 streams_mask) > > { > > + struct imx219 *imx219 = to_imx219(sd); > > struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); > > int ret; > > > > + if (pad != 0) > > + return -EINVAL; > > + > > ret = pm_runtime_resume_and_get(&client->dev); > > if (ret < 0) > > return ret; > > @@ -767,10 +772,6 @@ static int imx219_start_streaming(struct imx219 *imx219, > > if (ret) > > goto err_rpm_put; > > > > - /* vflip and hflip cannot change during streaming */ > > - __v4l2_ctrl_grab(imx219->vflip, true); > > - __v4l2_ctrl_grab(imx219->hflip, true); > > - > > Why do you drop these lines? It's not mentioned in the commit message. > Are these handled somewhere else now ? Thank you for catching that. I had made this patch earlier and sent it without re-verifying the changes. I should have reviewed it thoroughly before submitting. I will correct this in the next version. Apologies for the inconvenience. Best Regards, Tarang > -- > Kieran > > > > return 0; > > > > err_rpm_put: > > @@ -778,37 +779,25 @@ static int imx219_start_streaming(struct imx219 *imx219, > > return ret; > > } > > > > -static void imx219_stop_streaming(struct imx219 *imx219) > > +static int imx219_disable_streams(struct v4l2_subdev *sd, > > + struct v4l2_subdev_state *state, u32 pad, > > + u64 streams_mask) > > { > > + struct imx219 *imx219 = to_imx219(sd); > > struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); > > int ret; > > > > + if (pad != 0) > > + return -EINVAL; > > + > > /* set stream off register */ > > ret = cci_write(imx219->regmap, IMX219_REG_MODE_SELECT, > > IMX219_MODE_STANDBY, NULL); > > if (ret) > > dev_err(&client->dev, "%s failed to set stream\n", __func__); > > > > - __v4l2_ctrl_grab(imx219->vflip, false); > > - __v4l2_ctrl_grab(imx219->hflip, false); > > - > > pm_runtime_put(&client->dev); > > -} > > - > > -static int imx219_set_stream(struct v4l2_subdev *sd, int enable) > > -{ > > - struct imx219 *imx219 = to_imx219(sd); > > - struct v4l2_subdev_state *state; > > - int ret = 0; > > - > > - state = v4l2_subdev_lock_and_get_active_state(sd); > > - > > - if (enable) > > - ret = imx219_start_streaming(imx219, state); > > - else > > - imx219_stop_streaming(imx219); > > > > - v4l2_subdev_unlock_state(state); > > return ret; > > } > > > > @@ -992,7 +981,7 @@ static int imx219_init_state(struct v4l2_subdev *sd, > > } > > > > static const struct v4l2_subdev_video_ops imx219_video_ops = { > > - .s_stream = imx219_set_stream, > > + .s_stream = v4l2_subdev_s_stream_helper, > > }; > > > > static const struct v4l2_subdev_pad_ops imx219_pad_ops = { > > @@ -1001,6 +990,8 @@ static const struct v4l2_subdev_pad_ops imx219_pad_ops = { > > .set_fmt = imx219_set_pad_format, > > .get_selection = imx219_get_selection, > > .enum_frame_size = imx219_enum_frame_size, > > + .enable_streams = imx219_enable_streams, > > + .disable_streams = imx219_disable_streams, > > }; > > > > static const struct v4l2_subdev_ops imx219_subdev_ops = { > > -- > > 2.34.1 > >
diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index f662c9d75511..75d3123d47b4 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -723,12 +723,17 @@ static int imx219_configure_lanes(struct imx219 *imx219) ARRAY_SIZE(imx219_4lane_regs), NULL); }; -static int imx219_start_streaming(struct imx219 *imx219, - struct v4l2_subdev_state *state) +static int imx219_enable_streams(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, u32 pad, + u64 streams_mask) { + struct imx219 *imx219 = to_imx219(sd); struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); int ret; + if (pad != 0) + return -EINVAL; + ret = pm_runtime_resume_and_get(&client->dev); if (ret < 0) return ret; @@ -767,10 +772,6 @@ static int imx219_start_streaming(struct imx219 *imx219, if (ret) goto err_rpm_put; - /* vflip and hflip cannot change during streaming */ - __v4l2_ctrl_grab(imx219->vflip, true); - __v4l2_ctrl_grab(imx219->hflip, true); - return 0; err_rpm_put: @@ -778,37 +779,25 @@ static int imx219_start_streaming(struct imx219 *imx219, return ret; } -static void imx219_stop_streaming(struct imx219 *imx219) +static int imx219_disable_streams(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, u32 pad, + u64 streams_mask) { + struct imx219 *imx219 = to_imx219(sd); struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); int ret; + if (pad != 0) + return -EINVAL; + /* set stream off register */ ret = cci_write(imx219->regmap, IMX219_REG_MODE_SELECT, IMX219_MODE_STANDBY, NULL); if (ret) dev_err(&client->dev, "%s failed to set stream\n", __func__); - __v4l2_ctrl_grab(imx219->vflip, false); - __v4l2_ctrl_grab(imx219->hflip, false); - pm_runtime_put(&client->dev); -} - -static int imx219_set_stream(struct v4l2_subdev *sd, int enable) -{ - struct imx219 *imx219 = to_imx219(sd); - struct v4l2_subdev_state *state; - int ret = 0; - - state = v4l2_subdev_lock_and_get_active_state(sd); - - if (enable) - ret = imx219_start_streaming(imx219, state); - else - imx219_stop_streaming(imx219); - v4l2_subdev_unlock_state(state); return ret; } @@ -992,7 +981,7 @@ static int imx219_init_state(struct v4l2_subdev *sd, } static const struct v4l2_subdev_video_ops imx219_video_ops = { - .s_stream = imx219_set_stream, + .s_stream = v4l2_subdev_s_stream_helper, }; static const struct v4l2_subdev_pad_ops imx219_pad_ops = { @@ -1001,6 +990,8 @@ static const struct v4l2_subdev_pad_ops imx219_pad_ops = { .set_fmt = imx219_set_pad_format, .get_selection = imx219_get_selection, .enum_frame_size = imx219_enum_frame_size, + .enable_streams = imx219_enable_streams, + .disable_streams = imx219_disable_streams, }; static const struct v4l2_subdev_ops imx219_subdev_ops = {
Switch from s_stream to enable_streams and disable_streams callbacks. Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io> --- drivers/media/i2c/imx219.c | 43 +++++++++++++++----------------------- 1 file changed, 17 insertions(+), 26 deletions(-)