From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAE88187346 for ; Tue, 28 Jul 2026 05:01:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785214894; cv=none; b=tyQBOIMPrl2O6GlcLnPMLcZVF1dv1VPa5kPqcn9mMvdzeCF0IEfNa3uoOtY3fn+AesnZYDNDmmf76c++qZSP6R7Rp+XgCUU1CuIdpMgg+v+akkARO7SyPuVlriQzizVw1rjk53oPebW1NOBsIRiNBOltXLEgIppqhfVhfxnop4M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785214894; c=relaxed/simple; bh=UszfcBBQcICw94NLNTlnVjjLoit0BS8QpSab6plFqVw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LhqBQ+uQxte6FODirQADWa7JaSrX0GLyyIzFL19LDCRd2K28BJPbRoJjviPVSJ6d3G7vEs1mzCGbnrn9CFzdjMklFH36lttWFL7n19YkXW7Q4h7YRQFuOyiTYvQ5+umVK/4Fz4GGI/m7ECf6soR6dT9+lCVP7a5v7SLS8uWYSgk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YzsLlwxx; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YzsLlwxx" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cc7ef7ec27so43543735ad.1 for ; Mon, 27 Jul 2026 22:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785214891; x=1785819691; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EXLw2qYAX9E/FJ2MopzGW6N4TvWUucHeTTJeGbPG6U4=; b=YzsLlwxxdsxGXiCpfoQFrmBZUtIFSshL9+fVBk7K+Vx7vSLlYdQH235HCExjvCF0jD 1F9OwDpxT5vEwJyd2ByRUp/DApVqWiGAhtHvEZc9FIfwr4ATGmV4zZDo05oAvgTOSQwA chRNzBygPWd5OhkJjyqiQUjFcKcX8Qdo9x1rSu+rEfEOg5gmKOuoJfqx9YwI4WRtoqmm LzLknb7rZWl3yK9BzoI7fOw3qTb2gw/RJBcHT1iFZInyvfNJhs38n1QM+viSch02VSmM OzkBFFhGWZxj4Fi7/3i6Vorut6o+SHW/x/Mvwtd3cVPhAKCeHq1cOMtRJcitaRDYAf7/ lSMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785214891; x=1785819691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=EXLw2qYAX9E/FJ2MopzGW6N4TvWUucHeTTJeGbPG6U4=; b=BCRiMubZMmgiJ17dPZwel936qUu23EyXHiDckgJVGLjteiCOnF1xkFRJCw4EPz6ccs z3stOdhYW1eOt+zVyjt5ya+LjLsG8Fcg3XOU/kXdYMM3Tl+XBSNX22RLkae7pC05qreh 0/mQLDkFamZbVf5ywaXANoH0CkEZn1gJ5xBAi2xFFXyNNhkJE4AYnaa0RxD7ojUsfH0f arG/wogJZM3dbjfroJlvHHFahTcELdq8+7+bsXf5wY4hPqa8Ca8bmv3hkws4rIWKmUJu sKSochbANyS4yNJoMPiAGMTz3V6xnhSf2+JeC3VPACwv6iOXrR0Ov1GTsTxCfp5pdTg+ RKeQ== X-Forwarded-Encrypted: i=1; AHgh+RqT4LRjUIeA2ZA4TGyClcvV5cmzVCBcBSONmVDTIXij+y6KLUyyS+ZSErFAdq+Aan6qdOH7Kpj/MqR/UhY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6vfmu5Xig6iYpW5s+bAAn9Qg+wrgP/IEhpPOXRDpw9qqvtXyf QPB+/4D1e31rN+U4E1L6fHuvAtAxW26FxQ/u6Bh5tfZ3HnxgnqTaJ/qr X-Gm-Gg: AR+sD106ytcci2q0vS2XbFMlNnQcEZQGHQUKEnWI2hVkTR19YOW1sYll3MothZ/uoZ5 CfuCAajEETl+QRyDSOgjt1fJP+pCGNylSV2ra2HGFFN0+CXWCiSNOzXTiqEqwPQ+K5D+wwN5Ycs 5EnTHQUbbM4vfyppTEARl5SRMMEC1esHC2paHHSSyxYubc3j4j//D63u0Ce++sBEvdwltTMW/uv UKQ25EOD2PdcVcXJ2Z3al5ukbaFv8x8xLhTBxyQAaWiUMCtg7YLYvEmmaoMSLYTbM9Tnz35ypvb 9qMGivEksOY9YZ+YrX+tCg082Jrisph4ZsW+NxS2yTbzO+7r5c8ZZZ1DvDmCTcAZ0ihaL3vTc+z dGsrMbzBK69wWK0Bi1JFAmV2As5PALuFCzzj9tOW8VKAYLiEiDvGKUGGYGYKsuaO3wWZlpTZFpl mfK770WuRowuvnZSY+i5D+DKOO3WwxrLDR6muUrolf6V346VVOPD6J9LKH2b63wwUZ X-Received: by 2002:a17:902:fda5:b0:2ca:20b1:3e0a with SMTP id d9443c01a7336-2d015c8fbcemr11383945ad.3.1785214890986; Mon, 27 Jul 2026 22:01:30 -0700 (PDT) Received: from debian-rockchip-rock5b-rk3588.. ([2405:9800:b670:b64b:1c6e:95da:41c0:e7b6]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfde7bc57asm44882835ad.45.2026.07.27.22.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 22:01:30 -0700 (PDT) From: Tharit Tangkijwanichakul To: Nicolas Dufresne , Benjamin Gaignard , Philipp Zabel , Mauro Carvalho Chehab Cc: Ezequiel Garcia , Hans Verkuil , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel-mentees@lists.linux.dev, skhan@linuxfoundation.org, me@brighamcampbell.com, jkoolstra@xs4all.nl, Frank.li@oss.nxp.com, Tharit Tangkijwanichakul Subject: [PATCH v4] media: hantro: release runtime resources when device_run fails Date: Tue, 28 Jul 2026 04:59:21 +0000 Message-ID: <20260728045921.4761-1-tharitt97@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260726024243.730-1-tharitt97@gmail.com> References: <20260726024243.730-1-tharitt97@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit device_run() acquires a runtime PM reference and enables the VPU clocks before invoking the codec-specific run callback. If clk_bulk_enable() fails, the runtime PM reference is left held. If the codec-specific run callback fails, both the enabled clocks and the runtime PM reference are left held. Make the clocks part of the device's runtime PM state by enabling them from the runtime-resume callback and disabling them from the runtime-suspend callback. Fixes: 775fec69008d ("media: add Rockchip VPU JPEG encoder driver") Signed-off-by: Tharit Tangkijwanichakul --- Changes in v4: - Keep CONFIG_PM guard to avoid possible build error, as suggested by Frank Li. Changes in v3: - Move clock enable and disable operations into the runtime PM callbacks, as suggested by Frank Li. - Remove vpu from argument in hantro_job_finish() and hantro_job_finish_no_pm(). It is accessible by ctx. Changes in v2: - Fix the codec run failure path to disable the clocks before dropping the runtime PM reference. - Use a local vpu variable in device_run(). Tested on a ROCK 5B (RK3588) using the Hantro G1 decoder and Fluster: H.264 (JVT-AVC_V1): 129/135, unchanged MPEG-2 (MPEG2_VIDEO-MAIN): 23/43, unchanged VP8 (VP8-TEST-VECTORS): 61/61, unchanged .../media/platform/verisilicon/hantro_drv.c | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 2e81877f640f..d6fcd4f7f9da 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -59,8 +59,7 @@ static const struct v4l2_event hantro_eos_event = { .type = V4L2_EVENT_EOS }; -static void hantro_job_finish_no_pm(struct hantro_dev *vpu, - struct hantro_ctx *ctx, +static void hantro_job_finish_no_pm(struct hantro_ctx *ctx, enum vb2_buffer_state result) { struct vb2_v4l2_buffer *src, *dst; @@ -86,15 +85,13 @@ static void hantro_job_finish_no_pm(struct hantro_dev *vpu, result); } -static void hantro_job_finish(struct hantro_dev *vpu, - struct hantro_ctx *ctx, +static void hantro_job_finish(struct hantro_ctx *ctx, enum vb2_buffer_state result) { - pm_runtime_put_autosuspend(vpu->dev); - - clk_bulk_disable(vpu->variant->num_clocks, vpu->clocks); + struct hantro_dev *vpu = ctx->dev; - hantro_job_finish_no_pm(vpu, ctx, result); + pm_runtime_put_autosuspend(vpu->dev); + hantro_job_finish_no_pm(ctx, result); } void hantro_irq_done(struct hantro_dev *vpu, @@ -111,7 +108,7 @@ void hantro_irq_done(struct hantro_dev *vpu, if (cancel_delayed_work(&vpu->watchdog_work)) { if (result == VB2_BUF_STATE_DONE && ctx->codec_ops->done) ctx->codec_ops->done(ctx); - hantro_job_finish(vpu, ctx, result); + hantro_job_finish(ctx, result); } } @@ -127,7 +124,7 @@ void hantro_watchdog(struct work_struct *work) vpu_err("frame processing timed out!\n"); if (ctx->codec_ops->reset) ctx->codec_ops->reset(ctx); - hantro_job_finish(vpu, ctx, VB2_BUF_STATE_ERROR); + hantro_job_finish(ctx, VB2_BUF_STATE_ERROR); } } @@ -170,29 +167,24 @@ void hantro_end_prepare_run(struct hantro_ctx *ctx) static void device_run(void *priv) { struct hantro_ctx *ctx = priv; + struct hantro_dev *vpu = ctx->dev; struct vb2_v4l2_buffer *src, *dst; int ret; src = hantro_get_src_buf(ctx); dst = hantro_get_dst_buf(ctx); - ret = pm_runtime_resume_and_get(ctx->dev->dev); - if (ret < 0) - 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_resume_and_get(vpu->dev); + if (ret < 0) { + hantro_job_finish_no_pm(ctx, VB2_BUF_STATE_ERROR); + return; + } v4l2_m2m_buf_copy_metadata(src, dst); - if (ctx->codec_ops->run(ctx)) - goto err_cancel_job; - - return; - -err_cancel_job: - hantro_job_finish_no_pm(ctx->dev, ctx, VB2_BUF_STATE_ERROR); + ret = ctx->codec_ops->run(ctx); + if (ret) + hantro_job_finish(ctx, VB2_BUF_STATE_ERROR); } static const struct v4l2_m2m_ops vpu_m2m_ops = { @@ -1296,10 +1288,30 @@ static void hantro_remove(struct platform_device *pdev) static int hantro_runtime_resume(struct device *dev) { struct hantro_dev *vpu = dev_get_drvdata(dev); + int ret; + + ret = clk_bulk_enable(vpu->variant->num_clocks, vpu->clocks); + if (ret) + return ret; + + if (vpu->variant->runtime_resume) { + ret = vpu->variant->runtime_resume(vpu); + if (ret) + goto err_disable_clocks; + } + + return 0; - if (vpu->variant->runtime_resume) - return vpu->variant->runtime_resume(vpu); +err_disable_clocks: + clk_bulk_disable(vpu->variant->num_clocks, vpu->clocks); + return ret; +} +static int hantro_runtime_suspend(struct device *dev) +{ + struct hantro_dev *vpu = dev_get_drvdata(dev); + + clk_bulk_disable(vpu->variant->num_clocks, vpu->clocks); return 0; } #endif @@ -1307,7 +1319,7 @@ static int hantro_runtime_resume(struct device *dev) static const struct dev_pm_ops hantro_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) - SET_RUNTIME_PM_OPS(NULL, hantro_runtime_resume, NULL) + SET_RUNTIME_PM_OPS(hantro_runtime_suspend, hantro_runtime_resume, NULL) }; static struct platform_driver hantro_driver = { -- 2.47.3