From: jsg <jsg@openbsd.org>
Date: Fri, 3 Nov 2023 03:26:51 +0000 (+0000)
Subject: drm/amd: Disable ASPM for VI w/ all Intel systems
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4561fb9f9876045bd706b73ce7d664d1ba15580c;p=openbsd

drm/amd: Disable ASPM for VI w/ all Intel systems

From Mario Limonciello
024251bab25daf97a3599c985dd04117b9c60d6b in linux-6.1.y/6.1.61
64ffd2f1d00c6235dabe9704bbb0d9ce3e28147f in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/vi.c b/sys/dev/pci/drm/amd/amdgpu/vi.c
index 2a3fbba7605..e0893d9f961 100644
--- a/sys/dev/pci/drm/amd/amdgpu/vi.c
+++ b/sys/dev/pci/drm/amd/amdgpu/vi.c
@@ -1147,7 +1147,7 @@ static void vi_program_aspm(struct amdgpu_device *adev)
 	bool bL1SS = false;
 	bool bClkReqSupport = true;
 
-	if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_aspm_support_quirk())
+	if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_pcie_dynamic_switching_supported())
 		return;
 
 	if (adev->flags & AMD_IS_APU ||