drm/amd/amdgpu: enable ASPM on navi1x

enable ASPM on navi1x for the benifit of system power consumption
without performance hurt.

Signed-off-by: Kenneth Feng <kenneth.feng@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 46d4bba..d54af7f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -601,8 +601,7 @@ static void nv_program_aspm(struct amdgpu_device *adev)
        if (amdgpu_aspm != 1)
                return;
 
-       if ((adev->asic_type >= CHIP_SIENNA_CICHLID) &&
-           !(adev->flags & AMD_IS_APU) &&
+       if (!(adev->flags & AMD_IS_APU) &&
            (adev->nbio.funcs->program_aspm))
                adev->nbio.funcs->program_aspm(adev);
 
@@ -934,12 +933,7 @@ static int nv_update_umd_stable_pstate(struct amdgpu_device *adev,
        if (adev->gfx.funcs->update_perfmon_mgcg)
                adev->gfx.funcs->update_perfmon_mgcg(adev, !enter);
 
-       /*
-        * The ASPM function is not fully enabled and verified on
-        * Navi yet. Temporarily skip this until ASPM enabled.
-        */
-       if ((adev->asic_type >= CHIP_SIENNA_CICHLID) &&
-           !(adev->flags & AMD_IS_APU) &&
+       if (!(adev->flags & AMD_IS_APU) &&
            (adev->nbio.funcs->enable_aspm))
                adev->nbio.funcs->enable_aspm(adev, !enter);