fixes for 4.9

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.9/revert-drm-radeon-fix-eeh-during-kexec.patch b/queue-4.9/revert-drm-radeon-fix-eeh-during-kexec.patch
new file mode 100644 (file)
index 0000000..69b5e43
--- /dev/null
+++ b/queue-4.9/revert-drm-radeon-fix-eeh-during-kexec.patch
@@ -0,0 +1,49 @@
+From 504fe915a4062f94d57d9bf71ea55e22f55e333e Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 9 Oct 2019 13:12:37 -0500
+Subject: Revert "drm/radeon: Fix EEH during kexec"
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+[ Upstream commit 8d13c187c42e110625d60094668a8f778c092879 ]
+
+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: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/radeon/radeon_drv.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
+index 3ccf5b28b326e..30bd4a6a9d466 100644
+--- a/drivers/gpu/drm/radeon/radeon_drv.c
++++ b/drivers/gpu/drm/radeon/radeon_drv.c
+@@ -366,19 +366,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.20.1
+

diff --git a/queue-4.9/series b/queue-4.9/series
index a5a4c73c0a77c6bfd52e368d5384202ab8208146..0af7073d315c57d37efe6509eed853388c630265 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -9,3 +9,4 @@ mac80211-fix-txq-null-pointer-dereference.patch
 mips-loongson-fix-the-link-time-qualifier-of-serial_.patch
 net-hisilicon-fix-usage-of-uninitialized-variable-in.patch
 namespace-fix-namespace.pl-script-to-support-relativ.patch
+revert-drm-radeon-fix-eeh-during-kexec.patch