summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2019-10-30 02:21:27 +0000
committerjsg <jsg@openbsd.org>2019-10-30 02:21:27 +0000
commita1261f50213a1f51b8927222c38c1448aad0f84b (patch)
treef6897ed0f79825a9e6229c329402d53382e6287d
parentFix declaration of S1 by swapping misplaced ',' and ';'. (diff)
downloadwireguard-openbsd-a1261f50213a1f51b8927222c38c1448aad0f84b.tar.xz
wireguard-openbsd-a1261f50213a1f51b8927222c38c1448aad0f84b.zip
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)