lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 225/530] drm/amdgpu: add missing pci_disable_device() in amdgpu_pmops_runtime_resume()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit 6b11af6d1c8f5d4135332bb932baaa06e511173d ]

    Add missing pci_disable_device() if amdgpu_device_resume() fails.

    Fixes: 8e4d5d43cc6c ("drm/amdgpu: Handling of amdgpu_device_resume return value for graceful teardown")
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
    index f65b4b233ffb..28dea2eb61c7 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
    @@ -2415,8 +2415,11 @@ static int amdgpu_pmops_runtime_resume(struct device *dev)
    amdgpu_device_baco_exit(drm_dev);
    }
    ret = amdgpu_device_resume(drm_dev, false);
    - if (ret)
    + if (ret) {
    + if (amdgpu_device_supports_px(drm_dev))
    + pci_disable_device(pdev);
    return ret;
    + }

    if (amdgpu_device_supports_px(drm_dev))
    drm_dev->switch_power_state = DRM_SWITCH_POWER_ON;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 18:42    [W:2.305 / U:0.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site