drm/vc4: vec: Use pm_runtime_resume_and_get() in vc4_vec_encoder_enable()
Subsystems (3)
PATCH 1/1 drm/vc4: vec: Use pm_runtime_resume_and_get() in vc4_vec_encoder_enable()
Commit f0601ef8631c ("drm/vc4: vec: Protect device resources after removal") add fail path for vc4_vec_encoder_enable(), and will put usage_counter only when pm_runtime_get_sync() succeeds. However, pm_runtime_get_sync() will increment usage_counter even it failed. Fix it by replacing it with pm_runtime_resume_and_get() to keep usage counter balanced.
--- drivers/gpu/drm/vc4/vc4_vec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_vec.c +1 -1
@@ -367,7 +367,7 @@ static void vc4_vec_encoder_enable(struct drm_encoder *encoder,if (!drm_dev_enter (drm, &idx))return ; - ret =pm_runtime_get_sync (&vec->pdev->dev); + ret =pm_runtime_resume_and_get (&vec->pdev->dev);if (ret <0 ) {DRM_ERROR ("Failed to retain power domain: %d\n" , ret); goto err_dev_exit;
Signature · 1 line
2.17.1
Maxime Ripard
AppliedRe: (subset) [PATCH] drm/vc4: vec: Use pm_runtime_resume_and_get() in vc4_vec_encoder_enable()
Quoted 8 lines · Shang XiaoJing
Commit
f0601ef8631c("drm/vc4: vec: Protect device resources after removal") add fail path forvc4_vec_encoder_enable(), and will putusage_counteronly whenpm_runtime_get_sync()succeeds. However,pm_runtime_get_sync()will incrementusage_countereven it failed. Fix it by replacing it withpm_runtime_resume_and_get()to keep usage counter balanced.[...]
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime