From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: KyleMahlkuch <kmahlkuc@linux.vnet.ibm.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 4.14 06/28] drm/radeon: Fix EEH during kexec
Date: Tue, 24 Sep 2019 12:50:09 -0400 [thread overview]
Message-ID: <20190924165031.28292-6-sashal@kernel.org> (raw)
In-Reply-To: <20190924165031.28292-1-sashal@kernel.org>
From: KyleMahlkuch <kmahlkuc@linux.vnet.ibm.com>
[ Upstream commit 6f7fe9a93e6c09bf988c5059403f5f88e17e21e6 ]
During kexec some adapters hit an EEH since they are not properly
shut down in the radeon_pci_shutdown() function. Adding
radeon_suspend_kms() fixes this issue.
Signed-off-by: KyleMahlkuch <kmahlkuc@linux.vnet.ibm.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/radeon/radeon_drv.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index f4becad0a78c0..54d97dd5780a1 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -368,11 +368,19 @@ 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
next prev parent reply other threads:[~2019-09-24 16:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-24 16:50 [PATCH AUTOSEL 4.14 01/28] drm/bridge: tc358767: Increase AUX transfer length limit Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 02/28] drm/kms: Catch mode_object lifetime errors Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 03/28] drm/panel: simple: fix AUO g185han01 horizontal blanking Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 04/28] video: ssd1307fb: Start page range at page_offset Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 05/28] drm/stm: attach gem fence to atomic state Sasha Levin
2019-09-24 16:50 ` Sasha Levin [this message]
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 07/28] gpu: drm: radeon: Fix a possible null-pointer dereference in radeon_connector_set_property() Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 08/28] ipmi_si: Only schedule continuously in the thread in maintenance mode Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 09/28] clk: qoriq: Fix -Wunused-const-variable Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 10/28] clk: sunxi-ng: v3s: add missing clock slices for MMC2 module clocks Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 11/28] drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2) Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 12/28] clk: sirf: Don't reference clk_init_data after registration Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 13/28] clk: zx296718: " Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 14/28] powerpc/xmon: Check for HV mode when dumping XIVE info from OPAL Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 15/28] powerpc/rtas: use device model APIs and serialization during LPM Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 16/28] powerpc/futex: Fix warning: 'oldval' may be used uninitialized in this function Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 17/28] powerpc/64s/radix: Remove redundant pfn_pte bitop, add VM_BUG_ON Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 18/28] powerpc/pseries/mobility: use cond_resched when updating device tree Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 19/28] pinctrl: tegra: Fix write barrier placement in pmx_writel Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 20/28] vfio_pci: Restore original state on release Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 21/28] drm/nouveau/volt: Fix for some cards having 0 maximum voltage Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 22/28] drm/amdgpu/si: fix ASIC tests Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 23/28] powerpc/64s/exception: machine check use correct cfar for late handler Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 24/28] powerpc/pseries: correctly track irq state in default idle Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 25/28] arm64: fix unreachable code issue with cmpxchg Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 26/28] clk: at91: select parent if main oscillator or bypass is enabled Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 27/28] scsi: core: Reduce memory required for SCSI logging Sasha Levin
2019-09-24 16:50 ` [PATCH AUTOSEL 4.14 28/28] dma-buf/sw_sync: Synchronize signal vs syncpt free Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190924165031.28292-6-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=kmahlkuc@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox