drm/amd/amdgpu: disable ASPM on VI if pcie dpm is disabled

Disable ASPM on VI if PCIE dpm is disabled.

Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5370
Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
Reviewed-by: Yang Wang <kevinyang.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 78c96c7102e4c37ebb6d48ef4f2bef10abb8178a..631c49f568dbb2d631eafa8ee1867bfda4244f6a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1334,7 +1334,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)