lkml.org 
[lkml]   [2020]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 028/255] drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ Upstream commit f79f94765f8c39db0b7dec1d335ab046aac03f20 ]

    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_connectors.c | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
    index f355d9a752d29..a1aec205435de 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
    @@ -716,8 +716,10 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force)

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

    if (encoder) {
    @@ -854,8 +856,10 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)

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

    encoder = amdgpu_connector_best_single_encoder(connector);
    @@ -977,8 +981,10 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)

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

    if (!force && amdgpu_connector_check_hpd_status_unchanged(connector)) {
    @@ -1328,8 +1334,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)

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

    if (!force && amdgpu_connector_check_hpd_status_unchanged(connector)) {
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-01 17:39    [W:3.676 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site