[PATCH v3 03/12] media: verisilicon: Complete the request when the VPU can't resume
From: Arun Iyengar via B4 Relay
Date: Fri Nov 13 2026 - 14:44:42 EST
From: Arun Iyengar <aiyengar1990@xxxxxxxxx>
If pm_runtime_resume_and_get() fails, device_run() returns the buffers
without completing the controls of the request, and the request stays
queued forever. Complete them on that path.
Fixes: 7d47b45dc590 ("media: rockchip/vpu: Support the Request API")
Signed-off-by: Arun Iyengar <aiyengar1990@xxxxxxxxx>
---
drivers/media/platform/verisilicon/hantro_drv.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
index e86eb943d16a..42822b2b376c 100644
--- a/drivers/media/platform/verisilicon/hantro_drv.c
+++ b/drivers/media/platform/verisilicon/hantro_drv.c
@@ -176,16 +176,20 @@ static void device_run(void *priv)
dst = hantro_get_dst_buf(ctx);
ret = pm_runtime_resume_and_get(vpu->dev);
- if (ret < 0) {
- hantro_job_finish_no_pm(ctx, VB2_BUF_STATE_ERROR);
- return;
- }
+ if (ret < 0)
+ goto err_cancel_job;
v4l2_m2m_buf_copy_metadata(src, dst);
ret = ctx->codec_ops->run(ctx);
if (ret)
hantro_job_finish(ctx, VB2_BUF_STATE_ERROR);
+
+ return;
+
+err_cancel_job:
+ v4l2_ctrl_request_complete(src->vb2_buf.req_obj.req, &ctx->ctrl_handler);
+ hantro_job_finish_no_pm(ctx, VB2_BUF_STATE_ERROR);
}
static const struct v4l2_m2m_ops vpu_m2m_ops = {
--
2.55.0