summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2019-10-30 02:21:28 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2019-10-30 02:21:28 +0000
commit74e102f6c10f6eba2c14f2a70a25b831e819ea9a (patch)
treea5b2c6b72647d9acf524311643399508dcd3ab78
parente4728199106060e4cad02a3523a16fba1dad3d63 (diff)
Revert "drm/radeon: Fix EEH during kexec"
From Alex Deucher 0933b0db7fb239be01270b25bf73884870d8c1e6 in linux 4.19.y/4.19.81 8d13c187c42e110625d60094668a8f778c092879 in mainline linux
-rw-r--r--sys/dev/pci/drm/radeon/radeon_drv.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/sys/dev/pci/drm/radeon/radeon_drv.c b/sys/dev/pci/drm/radeon/radeon_drv.c
index 29e8037d6e3..a570d18563c 100644
--- a/sys/dev/pci/drm/radeon/radeon_drv.c
+++ b/sys/dev/pci/drm/radeon/radeon_drv.c
@@ -408,19 +408,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)