Revert "drm/radeon: Fix EEH during kexec"
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 9 Oct 2019 18:12:37 +0000 (13:12 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 12 Oct 2019 02:30:32 +0000 (21:30 -0500)
This reverts commit 6f7fe9a93e6c09bf988c5059403f5f88e17e21e6.

This breaks some boards.  Maybe just enable this on PPC for
now?

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=205147
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/radeon_drv.c

index d0bc91ed7c90a73b898e57a6a77a4786c11ed169..9e55076578c6b79850f4e981df22682d8b085863 100644 (file)
@@ -379,19 +379,11 @@ radeon_pci_remove(struct pci_dev *pdev)
 static void
 radeon_pci_shutdown(struct pci_dev *pdev)
 {
-       struct drm_device *ddev = pci_get_drvdata(pdev);
-
        /* if we are running in a VM, make sure the device
         * torn down properly on reboot/shutdown
         */
        if (radeon_device_is_virtual())
                radeon_pci_remove(pdev);
-
-       /* Some adapters need to be suspended before a
-       * shutdown occurs in order to prevent an error
-       * during kexec.
-       */
-       radeon_suspend_kms(ddev, true, true, false);
 }
 
 static int radeon_pmops_suspend(struct device *dev)