drm/nouveau: fix runtime pm imbalance on error
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Wed, 20 May 2020 10:25:49 +0000 (18:25 +0800)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 22 May 2020 01:13:52 +0000 (11:13 +1000)
pm_runtime_get_sync() increments the runtime PM usage counter even
the call returns an error code. Thus a pairing decrement is needed
on the error handling path to keep the counter balanced.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_gem.c

index f5ece1f9497348a892ca8a7ddc97354df409d60b..6697f960dd899eaa8e28783d472a1b19a4831712 100644 (file)
@@ -76,8 +76,10 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv)
                return ret;
 
        ret = pm_runtime_get_sync(dev);
-       if (ret < 0 && ret != -EACCES)
+       if (ret < 0 && ret != -EACCES) {
+               pm_runtime_put_autosuspend(dev);
                goto out;
+       }
 
        ret = nouveau_vma_new(nvbo, vmm, &vma);
        pm_runtime_mark_last_busy(dev);