* [PATCH v2 0/2] media: i2c: imx219: Minor improvements for runtime PM and stream handling
@ 2025-03-05 6:13 Tarang Raval
2025-03-05 6:13 ` [PATCH v2 1/2] media: i2c: imx219: switch to {enable,disable}_streams Tarang Raval
2025-03-05 6:13 ` [PATCH v2 2/2] media: i2c: imx219: Enable runtime PM autosuspend Tarang Raval
0 siblings, 2 replies; 5+ messages in thread
From: Tarang Raval @ 2025-03-05 6:13 UTC (permalink / raw)
To: sakari.ailus
Cc: Tarang Raval, Dave Stevenson, Mauro Carvalho Chehab, linux-media,
linux-kernel
v2 -> v1
- Dropped "Enable runtime PM before sub-device registration" patch,
as it has already been applied.
Tarang Raval (2):
media: i2c: imx219: switch to {enable,disable}_streams
media: i2c: imx219: Enable runtime PM autosuspend
drivers/media/i2c/imx219.c | 51 +++++++++++++++++---------------------
1 file changed, 23 insertions(+), 28 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/2] media: i2c: imx219: switch to {enable,disable}_streams
2025-03-05 6:13 [PATCH v2 0/2] media: i2c: imx219: Minor improvements for runtime PM and stream handling Tarang Raval
@ 2025-03-05 6:13 ` Tarang Raval
2025-03-05 9:25 ` Kieran Bingham
2025-03-05 6:13 ` [PATCH v2 2/2] media: i2c: imx219: Enable runtime PM autosuspend Tarang Raval
1 sibling, 1 reply; 5+ messages in thread
From: Tarang Raval @ 2025-03-05 6:13 UTC (permalink / raw)
To: sakari.ailus
Cc: Tarang Raval, Dave Stevenson, Mauro Carvalho Chehab, linux-media,
linux-kernel
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);
-
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] media: i2c: imx219: Enable runtime PM autosuspend
2025-03-05 6:13 [PATCH v2 0/2] media: i2c: imx219: Minor improvements for runtime PM and stream handling Tarang Raval
2025-03-05 6:13 ` [PATCH v2 1/2] media: i2c: imx219: switch to {enable,disable}_streams Tarang Raval
@ 2025-03-05 6:13 ` Tarang Raval
1 sibling, 0 replies; 5+ messages in thread
From: Tarang Raval @ 2025-03-05 6:13 UTC (permalink / raw)
To: sakari.ailus
Cc: Tarang Raval, Dave Stevenson, Mauro Carvalho Chehab, linux-media,
linux-kernel
Use pm_runtime_put_autosuspend() instead of pm_runtime_put()
to allow autosuspend. Set a 1000ms autosuspend delay in
imx219_probe() to improve power efficiency.
Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>
---
drivers/media/i2c/imx219.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
index 75d3123d47b4..5e134c9029cb 100644
--- a/drivers/media/i2c/imx219.c
+++ b/drivers/media/i2c/imx219.c
@@ -775,7 +775,8 @@ static int imx219_enable_streams(struct v4l2_subdev *sd,
return 0;
err_rpm_put:
- pm_runtime_put(&client->dev);
+ pm_runtime_mark_last_busy(&client->dev);
+ pm_runtime_put_autosuspend(&client->dev);
return ret;
}
@@ -796,7 +797,8 @@ static int imx219_disable_streams(struct v4l2_subdev *sd,
if (ret)
dev_err(&client->dev, "%s failed to set stream\n", __func__);
- pm_runtime_put(&client->dev);
+ pm_runtime_mark_last_busy(&client->dev);
+ pm_runtime_put_autosuspend(&client->dev);
return ret;
}
@@ -1268,6 +1270,8 @@ static int imx219_probe(struct i2c_client *client)
}
pm_runtime_idle(dev);
+ pm_runtime_set_autosuspend_delay(dev, 1000);
+ pm_runtime_use_autosuspend(dev);
return 0;
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] media: i2c: imx219: switch to {enable,disable}_streams
2025-03-05 6:13 ` [PATCH v2 1/2] media: i2c: imx219: switch to {enable,disable}_streams Tarang Raval
@ 2025-03-05 9:25 ` Kieran Bingham
2025-03-05 10:12 ` Tarang Raval
0 siblings, 1 reply; 5+ messages in thread
From: Kieran Bingham @ 2025-03-05 9:25 UTC (permalink / raw)
To: Tarang Raval, sakari.ailus
Cc: Tarang Raval, Dave Stevenson, Mauro Carvalho Chehab, linux-media,
linux-kernel
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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] media: i2c: imx219: switch to {enable,disable}_streams
2025-03-05 9:25 ` Kieran Bingham
@ 2025-03-05 10:12 ` Tarang Raval
0 siblings, 0 replies; 5+ messages in thread
From: Tarang Raval @ 2025-03-05 10:12 UTC (permalink / raw)
To: Kieran Bingham, sakari.ailus
Cc: Dave Stevenson, Mauro Carvalho Chehab, linux-media, linux-kernel
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
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-03-05 10:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-05 6:13 [PATCH v2 0/2] media: i2c: imx219: Minor improvements for runtime PM and stream handling Tarang Raval
2025-03-05 6:13 ` [PATCH v2 1/2] media: i2c: imx219: switch to {enable,disable}_streams Tarang Raval
2025-03-05 9:25 ` Kieran Bingham
2025-03-05 10:12 ` Tarang Raval
2025-03-05 6:13 ` [PATCH v2 2/2] media: i2c: imx219: Enable runtime PM autosuspend Tarang Raval
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®