Disable ASPM on VI if PCIE dpm is disabled.
This is a workaround for issue: 
https://gitlab.freedesktop.org/drm/amd/-/work_items/5370#note_3528027
For the other projects, ASPM are still independant to PCIE dpm.

Signed-off-by: Kenneth Feng <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 70d07ca187a3..9a8f9c74b474 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1333,7 +1333,8 @@ static bool amdgpu_device_aspm_support_quirk(struct 
amdgpu_device *adev)
         * It's unclear if this is a platform-specific or GPU-specific issue.
         * Disable ASPM on SI for the time being.
         */
-       if (adev->family == AMDGPU_FAMILY_SI)
+       if (adev->family == AMDGPU_FAMILY_SI ||
+               (!(adev->pm.pp_feature & PP_PCIE_DPM_MASK) && adev->family == 
AMDGPU_FAMILY_VI))
                return true;
 
 #if IS_ENABLED(CONFIG_X86)
-- 
2.34.1

Reply via email to