diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2019-10-04 14:57:21 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-10-15 15:51:39 -0400 |
| commit | 897483d8a0e0896b214bda374e67373ee01166a6 (patch) | |
| tree | b767f65f79d37806d574bac10601fcdd5cacd395 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | 803cc26d5cb6a3c93eab9124c1e218dc93066a6c (diff) | |
| download | linux-897483d8a0e0896b214bda374e67373ee01166a6.tar.gz linux-897483d8a0e0896b214bda374e67373ee01166a6.tar.bz2 linux-897483d8a0e0896b214bda374e67373ee01166a6.zip | |
drm/amdgpu: move gpu reset out of amdgpu_device_suspend
Move it into the caller. There are cases were we don't
want it. We need it for hibernation, but we don't need
it for runtime pm, so drop it for runtime pm.
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 9532338ae164..b29bdf22c8bf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3176,10 +3176,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) /* Shut down the device */ pci_disable_device(dev->pdev); pci_set_power_state(dev->pdev, PCI_D3hot); - } else { - r = amdgpu_asic_reset(adev); - if (r) - DRM_ERROR("amdgpu asic reset failed\n"); } return 0; |