diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2020-12-09 21:21:36 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-12-15 19:35:21 +0300 |
| commit | 637bb036ce665cede8914c4dca540d8f9f38af65 (patch) | |
| tree | 2fc8543df912db3509c3545c31474cc59c976a39 /drivers/gpu/drm/amd/amdgpu | |
| parent | ceb4de67c96051967c7c0095fc6036ef0d1e1248 (diff) | |
| download | linux-637bb036ce665cede8914c4dca540d8f9f38af65.tar.xz | |
drm/amdgpu: simplify logic in atpx resume handling
Simplify the logic in the runtime resume handling for
atpx
Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 4f97d493eeda..cac2724e7615 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1382,16 +1382,14 @@ static int amdgpu_pmops_runtime_resume(struct device *dev) /* Only need to handle PCI state in the driver for ATPX * PCI core handles it for _PR3. */ - if (amdgpu_is_atpx_hybrid()) { - pci_set_master(pdev); - } else { + if (!amdgpu_is_atpx_hybrid()) { pci_set_power_state(pdev, PCI_D0); amdgpu_device_load_pci_state(pdev); ret = pci_enable_device(pdev); if (ret) return ret; - pci_set_master(pdev); } + pci_set_master(pdev); } else if (amdgpu_device_supports_boco(drm_dev)) { /* Only need to handle PCI state in the driver for ATPX * PCI core handles it for _PR3. |