From: Alex Deucher Date: Wed, 9 Dec 2020 18:21:36 +0000 (-0500) Subject: drm/amdgpu: simplify logic in atpx resume handling X-Git-Tag: v5.15.73~12465^2~22^2~133 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=637bb036ce665cede8914c4dca540d8f9f38af65;p=platform%2Fkernel%2Flinux-rpi.git drm/amdgpu: simplify logic in atpx resume handling Simplify the logic in the runtime resume handling for atpx Acked-by: Evan Quan Signed-off-by: Alex Deucher --- 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.