lkml.org 
[lkml]   [2020]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 16/38] drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ Upstream commit e008fa6fb41544b63973a529b704ef342f47cc65 ]

    in amdgpu_display_crtc_set_config, the call to pm_runtime_get_sync
    increments the counter even in case of failure, leading to incorrect
    ref count. In case of failure, decrement the ref count before returning.

    Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
    index 686a26de50f91..049a1961c3fa5 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
    @@ -275,7 +275,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set,

    ret = pm_runtime_get_sync(dev->dev);
    if (ret < 0)
    - return ret;
    + goto out;

    ret = drm_crtc_helper_set_config(set, ctx);

    @@ -290,7 +290,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set,
    take the current one */
    if (active && !adev->have_disp_power_ref) {
    adev->have_disp_power_ref = true;
    - return ret;
    + goto out;
    }
    /* if we have no active crtcs, then drop the power ref
    we got before */
    @@ -299,6 +299,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set,
    adev->have_disp_power_ref = false;
    }

    +out:
    /* drop the power reference we got coming in here */
    pm_runtime_put_autosuspend(dev->dev);
    return ret;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-08-21 19:02    [W:3.817 / U:0.448 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site