From: jsg <jsg@openbsd.org>
Date: Thu, 24 Aug 2023 06:29:16 +0000 (+0000)
Subject: drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2f62752aca2ca622be1c4be10b8417652dea9d4d;p=openbsd

drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11

From Tim Huang
8abce61273c2815ea2ca096ecfb030c4b9e4e686 in linux-6.1.y/6.1.47
730d44e1fa306a20746ad4a85da550662aed9daa in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c
index f68365e8a89..828806828dd 100644
--- a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1562,9 +1562,9 @@ static int smu_disable_dpms(struct smu_context *smu)
 
 	/*
 	 * For SMU 13.0.4/11, PMFW will handle the features disablement properly
-	 * for gpu reset case. Driver involvement is unnecessary.
+	 * for gpu reset and S0i3 cases. Driver involvement is unnecessary.
 	 */
-	if (amdgpu_in_reset(adev)) {
+	if (amdgpu_in_reset(adev) || adev->in_s0ix) {
 		switch (adev->ip_versions[MP1_HWIP][0]) {
 		case IP_VERSION(13, 0, 4):
 		case IP_VERSION(13, 0, 11):