Skip to contentSkip to conversation

Revert "drm/radeon: Fix EEH during kexec"

PATCH In review Alex Deucher 3 participants 3 messages Oct 9, 2019 – Oct 14, 2019 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "drm/radeon: Fix EEH during kexec"

This reverts commit 6f7fe9a93e6c09bf988c5059403f5f88e17e21e6.

This breaks some boards. Maybe just enable this on PPC for now?

---
 drivers/gpu/drm/radeon/radeon_drv.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/gpu/drm/radeon/radeon_drv.c +0 -8
index 4267cb55bc33..2bc56f829bf7 100644
@@ -378,19 +378,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)
Signature · 1 line
2.20.1

A message that is not in the archive (sent off-list or not yet received): 20191009181503.20381-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org

#2 lore raw

Hi,

[This is an automated email]

This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.3.5, v5.2.20, v4.19.78, v4.14.148, v4.9.196, v4.4.196.

v5.3.5: Build OK!
v5.2.20: Build OK!
v4.19.78: Build OK!
v4.14.148: Build OK!
v4.9.196: Build OK!
v4.4.196: Failed to apply! Possible dependencies:
6f7fe9a93e6c0 ("drm/radeon: Fix EEH during kexec") a481daa88fd4d ("drm/radeon: always apply pci shutdown callbacks") a801abe4773da ("drm/radeon: wire up a pci shutdown callback") b9b487e494712 ("Revert "drm/radeon: always apply pci shutdown callbacks"")

NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?

Signature · 6 lines
Thanks,
Sasha
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer
#3 lore raw
In reply to Alex Deucher

Hi,

[This is an automated email]

This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v5.3.5, v5.2.20, v4.19.78, v4.14.148, v4.9.196, v4.4.196.

v5.3.5: Build OK!
v5.2.20: Build OK!
v4.19.78: Build OK!
v4.14.148: Build OK!
v4.9.196: Build OK!
v4.4.196: Failed to apply! Possible dependencies:
6f7fe9a93e6c0 ("drm/radeon: Fix EEH during kexec") a481daa88fd4d ("drm/radeon: always apply pci shutdown callbacks") a801abe4773da ("drm/radeon: wire up a pci shutdown callback") b9b487e494712 ("Revert "drm/radeon: always apply pci shutdown callbacks"")

NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?

Signature · 2 lines
Thanks,
Sasha