drm/amd: Use amdgpu_device_should_use_aspm on navi umd pstate switching

The `program_aspm` callback is already guarded for aspm, but the
`enable_aspm` callback doesn't follow the module parameter.

Update it to use the helper `amdgpu_device_should_use_aspm`.

Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index a4a6362dfb0920e9c64ee8e865cc18cc95354057..f1285cf6451783f639ece0ee131d3092c342f685 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -637,7 +637,8 @@ static int nv_update_umd_stable_pstate(struct amdgpu_device *adev,
                adev->gfx.funcs->update_perfmon_mgcg(adev, !enter);
 
        if (!(adev->flags & AMD_IS_APU) &&
-           (adev->nbio.funcs->enable_aspm))
+           (adev->nbio.funcs->enable_aspm) &&
+            amdgpu_device_should_use_aspm(adev))
                adev->nbio.funcs->enable_aspm(adev, !enter);
 
        return 0;