From: jsg <jsg@openbsd.org>
Date: Mon, 20 May 2024 05:06:41 +0000 (+0000)
Subject: dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=78756c27bbb374293dd359b69a9610a59dd4a53d;p=openbsd

dm/amd/pm: Fix problems with reboot/shutdown for some SMU 13.0.4/13.0.11 users

From Mario Limonciello
6c83a8f236ece78d5c2e60ae3dcfd1a64509410e in linux-6.6.y/6.6.31
cd94d1b182d2986378550c9087571991bfee01d4 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c b/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
index 1d1917e1b63..cd674ef5adb 100644
--- a/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
@@ -226,7 +226,7 @@ static int smu_v13_0_4_system_features_control(struct smu_context *smu, bool en)
 	struct amdgpu_device *adev = smu->adev;
 	int ret = 0;
 
-	if (!en && !adev->in_s0ix) {
+	if (!en && adev->in_s4) {
 		/* Adds a GFX reset as workaround just before sending the
 		 * MP1_UNLOAD message to prevent GC/RLC/PMFW from entering
 		 * an invalid state.