Re: [PATCH 2/2] drm/amd: Use amdgpu_device_should_use_aspm on navi umd pstate switching

[Lazar, Lijo]

On 2/17/2022 11:15 AM, Mario Limonciello wrote:

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`.

Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com>

Series is
        Reviewed-by: Lijo Lazar <lijo.la...@amd.com>

Thanks,
Lijo

---
  drivers/gpu/drm/amd/amdgpu/nv.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index ebed9c84db04..b246a37f4f39 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -635,7 +635,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;