Skip to contentSkip to conversation

drm/vc4: vec: Use pm_runtime_resume_and_get() in vc4_vec_encoder_enable()

PATCH Applied Shang XiaoJing 2 participants 2 messages Nov 24, 2022 – Nov 28, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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.

Fixes e4b81f8c74c8 ("drm/vc4: Add support for the VEC (Video Encoder) IP")
---
 drivers/gpu/drm/vc4/vc4_vec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_vec.c +1 -1
index 0b3333865702..f4e044ba09d4 100644
@@ -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
#1 lore raw

Re: (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 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.

[...]

Applied to drm/drm-misc (drm-misc-next).

Thanks!
Maxime