From: Kenneth Feng <kenneth.feng@amd.com>
Date: Tue, 1 Apr 2025 07:56:41 +0000 (+0800)
Subject: drm/amd/amdgpu: decouple ASPM with pcie dpm
X-Git-Tag: v6.16-rc1~144^2~10^2~348
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb00bf17328d80f519df93bebc41f6c9171547d6;p=thirdparty%2Fkernel%2Flinux.git

drm/amd/amdgpu: decouple ASPM with pcie dpm

ASPM doesn't need to be disabled if pcie dpm is disabled.
So ASPM can be independantly enabled.

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 979942f26dda7..cfaa5d77b20ac 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1897,8 +1897,6 @@ bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev)
 	}
 	if (adev->flags & AMD_IS_APU)
 		return false;
-	if (!(adev->pm.pp_feature & PP_PCIE_DPM_MASK))
-		return false;
 	return pcie_aspm_enabled(adev->pdev);
 }