media: hantro: fix runtime PM resource handling
Subsystems (3)
v5 cover media: hantro: fix runtime PM resource handling
The Hantro device_run() path acquires a runtime PM reference before invoking the codec-specific run callback. Failure paths can leave the runtime PM reference and enabled clocks held.
Patch 1 moves clock enable and disable operations into the runtime PM callbacks and releases the runtime PM reference when device_run() fails. It retains the existing CONFIG_PM conditional so that the patch remains independently buildable.
Patch 2 removes the explicit CONFIG_PM conditional, defines the PM operations with DEFINE_RUNTIME_DEV_PM_OPS(), and uses pm_ptr() when assigning the PM operations to the platform driver.
Changes in v5:
- Split the runtime PM changes into two patches.
- Move clock management into the runtime PM callbacks.
- Release the runtime PM reference on device_run() failure.
- Retain the CONFIG_PM conditional in patch 1.
- Remove the CONFIG_PM conditional in patch 2 using DEFINE_RUNTIME_DEV_PM_OPS() and pm_ptr().
v4:
https://lore.kernel.org/linux-media/[email protected]
Tharit Tangkijwanichakul (2):
media: hantro: release runtime resources when device_run fails
media: hantro: use DEFINE_RUNTIME_DEV_PM_OPS
.../media/platform/verisilicon/hantro_drv.c | 75 ++++++++++--------- 1 file changed, 41 insertions(+), 34 deletions(-)
---
Tested on a Rockchip RK3588 (Rock 5B) board with Fluster:
H.264 (JVT-AVC_V1): 129/135, unchanged
MPEG-2 (MPEG2_VIDEO-MAIN): 23/43, unchanged
VP8 (VP8-TEST-VECTORS): 61/61, unchanged
base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
Signature · 1 line
2.47.3
PATCH v5 1/2 media: hantro: release runtime resources when device_run fails
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.
--- .../media/platform/verisilicon/hantro_drv.c | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-)
drivers/media/platform/verisilicon/hantro_drv.c +39 -27
@@ -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 = {
Signature · 1 line
2.47.3
Re: [PATCH v5 1/2] media: hantro: release runtime resources when device_run fails
Quoted 7 lines · Tharit Tangkijwanichakul
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.
Quoted 7 lines
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 <[email protected]>---
Quoted 139 lines
.../media/platform/verisilicon/hantro_drv.c | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-)drivers/media/platform/verisilicon/hantro_drv.c +39
-28@@ -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
PATCH v5 2/2 media: hantro: use DEFINE_RUNTIME_DEV_PM_OPS
In reply to Tharit TangkijwanichakulThe runtime suspend and resume callbacks are currently guarded by CONFIG_PM. Removing the guard directly would leave the callbacks unused when CONFIG_PM is disabled.
Define the PM operations with DEFINE_RUNTIME_DEV_PM_OPS() and use pm_ptr() when assigning them to the platform driver. This keeps the PM callbacks available when needed while avoiding unused-function warnings for CONFIG_PM=n builds.
--- drivers/media/platform/verisilicon/hantro_drv.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/media/platform/verisilicon/hantro_drv.c +3 -8
@@ -1284,7 +1284,6 @@ static void hantro_remove(struct platform_device *pdev)pm_runtime_disable (vpu->dev); } -#ifdef CONFIG_PM static int hantro_runtime_resume (struct device *dev) {struct hantro_dev *vpu =dev_get_drvdata (dev);
@@ -1314,13 +1313,9 @@ static int hantro_runtime_suspend(struct device *dev)clk_bulk_disable (vpu->variant->num_clocks, vpu->clocks);return 0 ; } -#endif -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 (hantro_runtime_suspend, hantro_runtime_resume,NULL ) -}; +static DEFINE_RUNTIME_DEV_PM_OPS(hantro_pm_ops, hantro_runtime_suspend, + hantro_runtime_resume, NULL);static struct platform_driver hantro_driver = { .probe = hantro_probe,
@@ -1328,7 +1323,7 @@ static struct platform_driver hantro_driver = { .driver = { .name = DRIVER_NAME, .of_match_table = of_hantro_match, - .pm = &hantro_pm_ops, + .pm = pm_ptr(&hantro_pm_ops), }, };module_platform_driver (hantro_driver);
Signature · 1 line
2.47.3
Re: [PATCH v5 2/2] media: hantro: use DEFINE_RUNTIME_DEV_PM_OPS
Quoted 11 lines · Tharit Tangkijwanichakul
The runtime suspend and resume callbacks are currently guarded by
CONFIG_PM. Removing the guard directly would leave the callbacks unused whenCONFIG_PMis disabled.Define the PM operations with
DEFINE_RUNTIME_DEV_PM_OPS()and usepm_ptr()when assigning them to the platform driver. This keeps the PM callbacks available when needed while avoiding unused-function warnings forCONFIG_PM=nbuilds.Signed-off-by Tharit Tangkijwanichakul <[email protected]>---
Quoted 43 lines
drivers/media/platform/verisilicon/hantro_drv.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)drivers/media/platform/verisilicon/hantro_drv.c +3
-9@@ -1284,7 +1284,6 @@ static void hantro_remove(struct platform_device *pdev)pm_runtime_disable (vpu->dev); } -#ifdef CONFIG_PM static int hantro_runtime_resume (struct device *dev) {struct hantro_dev *vpu =dev_get_drvdata (dev);@@ -1314,13 +1313,9 @@ static int hantro_runtime_suspend(struct device *dev)clk_bulk_disable (vpu->variant->num_clocks, vpu->clocks);return 0 ; } -#endif -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 (hantro_runtime_suspend, hantro_runtime_resume,NULL ) -}; +static DEFINE_RUNTIME_DEV_PM_OPS(hantro_pm_ops, hantro_runtime_suspend, + hantro_runtime_resume, NULL);static struct platform_driver hantro_driver = { .probe = hantro_probe,@@ -1328,7 +1323,7 @@ static struct platform_driver hantro_driver = { .driver = { .name = DRIVER_NAME, .of_match_table = of_hantro_match, - .pm = &hantro_pm_ops, + .pm = pm_ptr(&hantro_pm_ops), }, };module_platform_driver (hantro_driver); --2.47.3