drm/radeon: do not hard reset GPU while freezing on r600/r700 family
authorJérôme Glisse <jglisse@redhat.com>
Tue, 7 Jun 2016 21:43:04 +0000 (17:43 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 13 Jun 2016 16:21:51 +0000 (12:21 -0400)
Seems r600/r700 does not like hard reset while freezing for hibernation
(regression due to 274ad65c9d02bdcbee9bae045517864c3521d530 which itself
is a fix for hibernation on some GPU families). Until i can debug further
issue with r600, let just disable this for r600/r700 as they are very
similar family and bug affecting one likely affect the other.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/radeon_device.c

index e721e6b2766e4973ca3e0647e9e75c6b10f85622..e61c7636864ded748588df1afd71ed773678c278 100644 (file)
@@ -1631,7 +1631,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_R600) {
+       if (freeze && rdev->family >= CHIP_CEDAR) {
                rdev->asic->asic_reset(rdev, true);
                pci_restore_state(dev->pdev);
        } else if (suspend) {