diff options
author | Dinghao Liu <dinghao.liu@zju.edu.cn> | 2020-05-20 12:14:53 +0200 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2020-05-22 03:13:52 +0200 |
commit | 00583fbe8031f69bba8b0a9a861efb75fb7131af (patch) | |
tree | 976eb43cae6f080d4937f17e88dad1bb57901ce1 | |
parent | drm/nouveau/nouveau/hmm: fix migrate zero page to GPU (diff) | |
download | linux-00583fbe8031f69bba8b0a9a861efb75fb7131af.tar.xz linux-00583fbe8031f69bba8b0a9a861efb75fb7131af.zip |
drm/nouveau/debugfs: fix runtime pm imbalance on error
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>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_debugfs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index 63cb5e432f8a..63b5c8cf9ae4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -181,8 +181,11 @@ nouveau_debugfs_pstate_set(struct file *file, const char __user *ubuf, } ret = pm_runtime_get_sync(drm->dev); - if (ret < 0 && ret != -EACCES) + if (ret < 0 && ret != -EACCES) { + pm_runtime_put_autosuspend(drm->dev); return ret; + } + ret = nvif_mthd(ctrl, NVIF_CONTROL_PSTATE_USER, &args, sizeof(args)); pm_runtime_put_autosuspend(drm->dev); if (ret < 0) |