lkml.org 
[lkml]   [2020]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 273/388] drm/nouveau/debugfs: fix runtime pm imbalance on error
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit 00583fbe8031f69bba8b0a9a861efb75fb7131af ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/nouveau/nouveau_debugfs.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
    index 5c314f135dd10..3b13feca970f7 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
    @@ -183,8 +183,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)
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-29 14:00    [W:4.026 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site