media: hantro: do a PM resume earlier

[ Upstream commit 892bb6ecead9b834ba7ad1d07513e9eba1baa3a4 ]

The device_run() first enables the clock and then
tries to resume PM runtime, checking for errors.

Well, if for some reason the pm_runtime can not resume,
it would be better to detect it beforehand.

So, change the order inside device_run().

Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
Fixes: 775fec69008d ("media: add Rockchip VPU JPEG encoder driver")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index 3cd00cc..7749ca9 100644 (file)
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -56,16 +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);
        dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
 
@@ -81,6 +77,18 @@ 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);
+
+       clk_bulk_disable(vpu->variant->num_clocks, vpu->clocks);
+
+       hantro_job_finish_no_pm(vpu, ctx, result);
+}
+
 void hantro_irq_done(struct hantro_dev *vpu,
                     enum vb2_buffer_state result)
 {
@@ -152,12 +160,15 @@ static void device_run(void *priv)
        src = hantro_get_src_buf(ctx);
        dst = hantro_get_dst_buf(ctx);
 
+       ret = pm_runtime_get_sync(ctx->dev->dev);
+       if (ret < 0) {
+               pm_runtime_put_noidle(ctx->dev->dev);
+               goto err_cancel_job;
+       }
+
        ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
        if (ret)
                goto err_cancel_job;
-       ret = pm_runtime_get_sync(ctx->dev->dev);
-       if (ret < 0)
-               goto err_cancel_job;
 
        v4l2_m2m_buf_copy_metadata(src, dst, true);
 
@@ -165,7 +176,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 = {