From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Pavel Machek <pavel@denx.de>,
Andrey Konovalov <andrey.konovalov@linaro.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Jacopo Mondi <jacopo@jmondi.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-renesas-soc@vger.kernel.org,
Prabhakar <prabhakar.csengg@gmail.com>,
Biju Das <biju.das.jz@bp.renesas.com>
Subject: Re: [PATCH v2 2/2] media: i2c: imx219: Balance runtime PM use-count
Date: Mon, 15 Mar 2021 02:03:56 +0200 [thread overview]
Message-ID: <YE6kbFmIrk2nyQv8@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20210311095205.8095-3-prabhakar.mahadev-lad.rj@bp.renesas.com>
Hi Prabhakar,
Thank you for the patch.
On Thu, Mar 11, 2021 at 09:52:05AM +0000, Lad Prabhakar wrote:
> Move incrementing/decrementing runtime PM count to
> imx219_start_streaming()/imx219_stop_streaming() functions respectively.
>
> This fixes an issue of unbalanced runtime PM count in resume callback
> error path where streaming is stopped and runtime PM count is left
> unbalanced.
>
> Fixes: 1283b3b8f82b9 ("media: i2c: Add driver for Sony IMX219 sensor")
> Reported-by: Pavel Machek <pavel@denx.de>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/i2c/imx219.c | 32 +++++++++++++++++---------------
> 1 file changed, 17 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
> index 82756cbfbaac..49ba39418360 100644
> --- a/drivers/media/i2c/imx219.c
> +++ b/drivers/media/i2c/imx219.c
> @@ -1035,37 +1035,47 @@ static int imx219_start_streaming(struct imx219 *imx219)
> const struct imx219_reg_list *reg_list;
> int ret;
>
> + ret = pm_runtime_get_sync(&client->dev);
> + if (ret < 0) {
> + pm_runtime_put_noidle(&client->dev);
> + return ret;
> + }
> +
> /* Apply default values of current mode */
> reg_list = &imx219->mode->reg_list;
> ret = imx219_write_regs(imx219, reg_list->regs, reg_list->num_of_regs);
> if (ret) {
> dev_err(&client->dev, "%s failed to set mode\n", __func__);
> - return ret;
> + goto err_rpm_put;
> }
>
> ret = imx219_set_framefmt(imx219);
> if (ret) {
> dev_err(&client->dev, "%s failed to set frame format: %d\n",
> __func__, ret);
> - return ret;
> + goto err_rpm_put;
> }
>
> /* Apply customized values from user */
> ret = __v4l2_ctrl_handler_setup(imx219->sd.ctrl_handler);
> if (ret)
> - return ret;
> + goto err_rpm_put;
>
> /* set stream on register */
> ret = imx219_write_reg(imx219, IMX219_REG_MODE_SELECT,
> IMX219_REG_VALUE_08BIT, IMX219_MODE_STREAMING);
> if (ret)
> - return 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:
> + pm_runtime_put(&client->dev);
> + return ret;
> }
>
> static void imx219_stop_streaming(struct imx219 *imx219)
> @@ -1081,12 +1091,13 @@ static void imx219_stop_streaming(struct imx219 *imx219)
>
> __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 i2c_client *client = v4l2_get_subdevdata(sd);
> int ret = 0;
>
> mutex_lock(&imx219->mutex);
> @@ -1096,22 +1107,15 @@ static int imx219_set_stream(struct v4l2_subdev *sd, int enable)
> }
>
> if (enable) {
> - ret = pm_runtime_get_sync(&client->dev);
> - if (ret < 0) {
> - pm_runtime_put_noidle(&client->dev);
> - goto err_unlock;
> - }
> -
> /*
> * Apply default & customized values
> * and then start streaming.
> */
> ret = imx219_start_streaming(imx219);
> if (ret)
> - goto err_rpm_put;
> + goto err_unlock;
> } else {
> imx219_stop_streaming(imx219);
> - pm_runtime_put(&client->dev);
> }
>
> imx219->streaming = enable;
> @@ -1120,8 +1124,6 @@ static int imx219_set_stream(struct v4l2_subdev *sd, int enable)
>
> return ret;
>
> -err_rpm_put:
> - pm_runtime_put(&client->dev);
> err_unlock:
> mutex_unlock(&imx219->mutex);
>
--
Regards,
Laurent Pinchart
prev parent reply other threads:[~2021-03-15 0:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 9:52 [PATCH v2 0/2] media: i2c: imx219: Trivial Fixes Lad Prabhakar
2021-03-11 9:52 ` [PATCH v2 1/2] media: i2c: imx219: Move out locking/unlocking of vflip and hflip controls from imx219_set_stream Lad Prabhakar
2021-03-15 0:02 ` Laurent Pinchart
2021-03-11 9:52 ` [PATCH v2 2/2] media: i2c: imx219: Balance runtime PM use-count Lad Prabhakar
2021-03-15 0:03 ` Laurent Pinchart [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YE6kbFmIrk2nyQv8@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=andrey.konovalov@linaro.org \
--cc=biju.das.jz@bp.renesas.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jacopo@jmondi.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=pavel@denx.de \
--cc=prabhakar.csengg@gmail.com \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).