diff options
| author |   Alex Deucher <alexander.deucher@amd.com> | 2017-09-15 11:55:27 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-15 11:55:27 -0400 |
| commit | 820608548737e315c6f93e3099b4e65bde062334 (patch) | |
| tree | 74add47900010658ce7c6b66fb617dbddd66f226 /drivers/gpu/drm/radeon | |
| parent | drm/amdgpu: revert tile table update for oland (diff) | |
| download | linux-dev-820608548737e315c6f93e3099b4e65bde062334.tar.xz linux-dev-820608548737e315c6f93e3099b4e65bde062334.zip | |
drm/radeon: disable hard reset in hibernate for APUs
Fixes a hibernation regression on APUs.
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=191571
Fixes: 274ad65c9d02bdc (drm/radeon: hard reset r600 and newer GPU when hibernating.)
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 997131d58c7f..ffc10cadcf34 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1663,7 +1663,7 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, radeon_agp_suspend(rdev); pci_save_state(dev->pdev); - if (freeze && rdev->family >= CHIP_CEDAR) { + if (freeze && rdev->family >= CHIP_CEDAR && !(rdev->flags & RADEON_IS_IGP)) { rdev->asic->asic_reset(rdev, true); pci_restore_state(dev->pdev); } else if (suspend) { |