From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: <linuxarm@huawei.com>, <mauro.chehab@huawei.com>,
Ezequiel Garcia <ezequiel@collabora.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
<devel@driverdev.osuosl.org>, <linux-kernel@vger.kernel.org>,
<linux-media@vger.kernel.org>,
<linux-rockchip@lists.infradead.org>
Subject: Re: [PATCH v4 78/79] media: hantro: use pm_runtime_resume_and_get()
Date: Fri, 30 Apr 2021 19:09:00 +0100 [thread overview]
Message-ID: <20210430190900.00004dd3@Huawei.com> (raw)
In-Reply-To: <803c39fafdd62efc6f9e4d99a372af2c6955143b.1619621413.git.mchehab+huawei@kernel.org>
On Wed, 28 Apr 2021 16:52:39 +0200
Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote:
> Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
> added pm_runtime_resume_and_get() in order to automatically handle
> dev->power.usage_count decrement on errors.
>
> While there's nothing wrong with the current usage on this driver,
> as we're getting rid of the pm_runtime_get_sync() call all over
> the media subsystem, let's remove the last occurrence on this
> driver.
Not sure there is nothing wrong in here before your patch...
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
> ---
> drivers/staging/media/hantro/hantro_drv.c | 23 ++++++++++++++++-------
> 1 file changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
> index 595e82a82728..25fa36e7e773 100644
> --- a/drivers/staging/media/hantro/hantro_drv.c
> +++ b/drivers/staging/media/hantro/hantro_drv.c
> @@ -56,14 +56,12 @@ dma_addr_t hantro_get_ref(struct hantro_ctx *ctx, u64 ts)
> return hantro_get_dec_buf_addr(ctx, buf);
> }
>
> -static void hantro_job_finish(struct hantro_dev *vpu,
> - struct hantro_ctx *ctx,
> - enum vb2_buffer_state result)
> +static void hantro_job_finish_no_pm(struct hantro_dev *vpu,
> + struct hantro_ctx *ctx,
> + enum vb2_buffer_state result)
> {
> struct vb2_v4l2_buffer *src, *dst;
>
> - pm_runtime_mark_last_busy(vpu->dev);
> - pm_runtime_put_autosuspend(vpu->dev);
> clk_bulk_disable(vpu->variant->num_clocks, vpu->clocks);
>
> src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
> @@ -81,6 +79,16 @@ static void hantro_job_finish(struct hantro_dev *vpu,
> result);
> }
>
> +static void hantro_job_finish(struct hantro_dev *vpu,
> + struct hantro_ctx *ctx,
> + enum vb2_buffer_state result)
> +{
> + pm_runtime_mark_last_busy(vpu->dev);
> + pm_runtime_put_autosuspend(vpu->dev);
> +
> + hantro_job_finish_no_pm(vpu, ctx, result);
> +}
> +
> void hantro_irq_done(struct hantro_dev *vpu,
> enum vb2_buffer_state result)
> {
> @@ -155,7 +163,8 @@ static void device_run(void *priv)
> ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
> if (ret)
> goto err_cancel_job;
Before your patch, if this error condition happened, we'd call runtime_put
before the related runtime_get... You fixed that, but the patch description
doesn't call it out.
> - ret = pm_runtime_get_sync(ctx->dev->dev);
> +
> + ret = pm_runtime_resume_and_get(ctx->dev->dev);
> if (ret < 0)
> goto err_cancel_job;
>
> @@ -165,7 +174,7 @@ static void device_run(void *priv)
> return;
>
> err_cancel_job:
> - hantro_job_finish(ctx->dev, ctx, VB2_BUF_STATE_ERROR);
> + hantro_job_finish_no_pm(ctx->dev, ctx, VB2_BUF_STATE_ERROR);
> }
>
> static struct v4l2_m2m_ops vpu_m2m_ops = {
next prev parent reply other threads:[~2021-04-30 18:10 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 14:51 [PATCH v4 00/79] Address some issues with PM runtime at media subsystem Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 01/79] media: venus: fix PM runtime logic at venus_sys_error_handler() Mauro Carvalho Chehab
2021-04-30 15:21 ` Jonathan Cameron
2021-05-03 9:00 ` Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 02/79] media: s6p_cec: decrement usage count if disabled Mauro Carvalho Chehab
2021-04-28 15:31 ` Sylwester Nawrocki
2021-04-28 14:51 ` [PATCH v4 03/79] media: i2c: ccs-core: return the right error code at suspend Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 04/79] media: i2c: ov7740: don't resume at remove time Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 05/79] media: i2c: video-i2c: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 06/79] media: i2c: imx334: fix the pm runtime get logic Mauro Carvalho Chehab
2021-04-30 15:54 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 07/79] media: exynos-gsc: don't resume at remove time Mauro Carvalho Chehab
2021-04-28 15:25 ` Sylwester Nawrocki
2021-04-28 19:44 ` kernel test robot
2021-04-28 19:56 ` kernel test robot
2021-04-28 14:51 ` [PATCH v4 08/79] media: atmel: properly get pm_runtime Mauro Carvalho Chehab
2021-04-30 16:13 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 09/79] media: marvel-ccic: fix some issues when getting pm_runtime Mauro Carvalho Chehab
2021-04-30 16:29 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 10/79] media: mdk-mdp: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-30 16:30 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 11/79] media: rcar_fdp1: " Mauro Carvalho Chehab
2021-04-30 16:26 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 12/79] media: renesas-ceu: Properly check for PM errors Mauro Carvalho Chehab
2021-04-30 16:28 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 13/79] media: s5p: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 14/79] media: am437x: " Mauro Carvalho Chehab
2021-04-30 16:36 ` Jonathan Cameron
2021-05-04 7:19 ` Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 15/79] media: sh_vou: " Mauro Carvalho Chehab
2021-04-30 16:40 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 16/79] media: mtk-vcodec: " Mauro Carvalho Chehab
2021-04-30 16:44 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 17/79] media: s5p-jpeg: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 18/79] media: sti/delta: " Mauro Carvalho Chehab
2021-04-30 16:47 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 19/79] media: sunxi: " Mauro Carvalho Chehab
2021-04-30 16:48 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 20/79] staging: media: rkvdec: " Mauro Carvalho Chehab
2021-04-28 15:09 ` Johan Hovold
2021-04-29 7:38 ` Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 21/79] staging: media: atomisp: use pm_runtime_resume_and_get() Mauro Carvalho Chehab
2021-04-30 16:59 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 22/79] staging: media: imx7-mipi-csis: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 23/79] staging: media: ipu3: " Mauro Carvalho Chehab
2021-04-30 17:03 ` Jonathan Cameron
2021-05-03 9:57 ` Johan Hovold
2021-04-28 14:51 ` [PATCH v4 24/79] staging: media: cedrus_video: " Mauro Carvalho Chehab
2021-04-30 17:05 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 25/79] staging: media: tegra-vde: " Mauro Carvalho Chehab
2021-04-29 12:38 ` Dmitry Osipenko
2021-04-30 17:08 ` Jonathan Cameron
2021-04-30 17:11 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 26/79] staging: media: tegra-video: " Mauro Carvalho Chehab
2021-04-30 17:13 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 27/79] media: i2c: ak7375: " Mauro Carvalho Chehab
2021-04-30 17:14 ` Jonathan Cameron
2021-04-28 14:51 ` [PATCH v4 28/79] media: i2c: ccs-core: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 29/79] media: i2c: dw9714: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 30/79] media: i2c: dw9768: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 31/79] media: i2c: dw9807-vcm: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 32/79] media: i2c: hi556: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 33/79] media: i2c: imx214: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 34/79] media: i2c: imx219: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 35/79] media: i2c: imx258: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 36/79] media: i2c: imx274: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 37/79] media: i2c: imx290: " Mauro Carvalho Chehab
2021-04-28 14:51 ` [PATCH v4 38/79] media: i2c: imx319: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 39/79] media: i2c: imx355: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 40/79] media: i2c: mt9m001: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 41/79] media: i2c: ov02a10: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 42/79] media: i2c: ov13858: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 43/79] media: i2c: ov2659: " Mauro Carvalho Chehab
2021-05-03 12:30 ` Lad, Prabhakar
2021-04-28 14:52 ` [PATCH v4 44/79] media: i2c: ov2685: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 45/79] media: i2c: ov2740: " Mauro Carvalho Chehab
2021-04-30 17:20 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 46/79] media: i2c: ov5647: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 47/79] media: i2c: ov5648: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 48/79] media: i2c: ov5670: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 49/79] media: i2c: ov5675: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 50/79] media: i2c: ov5695: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 51/79] media: i2c: ov7740: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 52/79] media: i2c: ov8856: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 53/79] media: i2c: ov8865: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 54/79] media: i2c: ov9734: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 55/79] media: i2c: tvp5150: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 56/79] media: i2c: video-i2c: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 57/79] media: rockchip/rga: " Mauro Carvalho Chehab
2021-04-28 17:11 ` Ezequiel Garcia
2021-04-28 14:52 ` [PATCH v4 58/79] media: sti/hva: " Mauro Carvalho Chehab
2021-04-30 17:35 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 59/79] media: sti/bdisp: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 60/79] media: ipu3: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 61/79] media: coda: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 62/79] media: exynos4-is: " Mauro Carvalho Chehab
2021-04-30 17:49 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 63/79] media: exynos-gsc: " Mauro Carvalho Chehab
2021-04-30 17:50 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 64/79] media: mtk-jpeg: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 65/79] media: camss: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 66/79] media: venus: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 67/79] media: venus: vdec: " Mauro Carvalho Chehab
2021-04-30 17:53 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 68/79] media: venus: venc: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 69/79] media: rcar-fcp: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 70/79] media: rkisp1: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 71/79] media: s3c-camif: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 72/79] media: s5p-mfc: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 73/79] media: stm32: " Mauro Carvalho Chehab
2021-04-30 17:58 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 74/79] media: sunxi: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 75/79] media: ti-vpe: " Mauro Carvalho Chehab
2021-04-30 18:03 ` Jonathan Cameron
2021-05-03 12:49 ` Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 76/79] media: vsp1: " Mauro Carvalho Chehab
2021-04-28 14:52 ` [PATCH v4 77/79] media: rcar-vin: " Mauro Carvalho Chehab
2021-04-30 18:05 ` Jonathan Cameron
2021-04-28 14:52 ` [PATCH v4 78/79] media: hantro: " Mauro Carvalho Chehab
2021-04-28 17:14 ` Ezequiel Garcia
2021-04-30 18:09 ` Jonathan Cameron [this message]
2021-04-28 14:52 ` [PATCH v4 79/79] media: hantro: do a PM resume earlier Mauro Carvalho Chehab
2021-04-28 17:17 ` Ezequiel Garcia
2021-04-29 7:13 ` Mauro Carvalho Chehab
2021-04-28 15:50 ` [PATCH v4 00/79] Address some issues with PM runtime at media subsystem Johan Hovold
2021-04-29 10:18 ` Mauro Carvalho Chehab
2021-04-29 12:33 ` Dmitry Osipenko
2021-04-29 15:17 ` Johan Hovold
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=20210430190900.00004dd3@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=devel@driverdev.osuosl.org \
--cc=ezequiel@collabora.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linuxarm@huawei.com \
--cc=mauro.chehab@huawei.com \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
/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).