| From 0e6bf562e67bf8785a2d051323759b68d36f8a9d Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Wed, 9 Oct 2019 13:12:37 -0500 |
| Subject: [PATCH] Revert "drm/radeon: Fix EEH during kexec" |
| |
| commit 8d13c187c42e110625d60094668a8f778c092879 upstream. |
| |
| 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 |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c |
| index 92d02ce14d5b..5502e3428868 100644 |
| --- a/drivers/gpu/drm/radeon/radeon_drv.c |
| +++ b/drivers/gpu/drm/radeon/radeon_drv.c |
| @@ -375,19 +375,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) |
| -- |
| 2.7.4 |
| |
