lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 063/228] drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync
    Date
    From: Aditya Pakki <pakki001@umn.edu>

    [ Upstream commit 9fb10671011143d15b6b40d6d5fa9c52c57e9d63 ]

    On calling pm_runtime_get_sync() the reference count of the device
    is incremented. In case of failure, decrement the
    reference count before returning the error.

    Acked-by: Evan Quan <evan.quan@amd.com>
    Signed-off-by: Aditya Pakki <pakki001@umn.edu>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/radeon/radeon_display.c | 4 +++-
    drivers/gpu/drm/radeon/radeon_drv.c | 4 +++-
    drivers/gpu/drm/radeon/radeon_kms.c | 4 +++-
    3 files changed, 9 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
    index d86110cdf0852..b2334349799d1 100644
    --- a/drivers/gpu/drm/radeon/radeon_display.c
    +++ b/drivers/gpu/drm/radeon/radeon_display.c
    @@ -627,8 +627,10 @@ radeon_crtc_set_config(struct drm_mode_set *set,
    dev = set->crtc->dev;

    ret = pm_runtime_get_sync(dev->dev);
    - if (ret < 0)
    + if (ret < 0) {
    + pm_runtime_put_autosuspend(dev->dev);
    return ret;
    + }

    ret = drm_crtc_helper_set_config(set, ctx);

    diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
    index f6908e2f9e55a..41e8abd099784 100644
    --- a/drivers/gpu/drm/radeon/radeon_drv.c
    +++ b/drivers/gpu/drm/radeon/radeon_drv.c
    @@ -496,8 +496,10 @@ long radeon_drm_ioctl(struct file *filp,
    long ret;
    dev = file_priv->minor->dev;
    ret = pm_runtime_get_sync(dev->dev);
    - if (ret < 0)
    + if (ret < 0) {
    + pm_runtime_put_autosuspend(dev->dev);
    return ret;
    + }

    ret = drm_ioctl(filp, cmd, arg);

    diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
    index dfee8f7d94ae5..2e28cf8118404 100644
    --- a/drivers/gpu/drm/radeon/radeon_kms.c
    +++ b/drivers/gpu/drm/radeon/radeon_kms.c
    @@ -659,8 +659,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
    file_priv->driver_priv = NULL;

    r = pm_runtime_get_sync(dev->dev);
    - if (r < 0)
    + if (r < 0) {
    + pm_runtime_put_autosuspend(dev->dev);
    return r;
    + }

    /* new gpu have virtual address space support */
    if (rdev->family >= CHIP_CAYMAN) {
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 13:17    [W:3.668 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site