drm/amdgpu: cleanup init power gating function
authorHuang Rui <ray.huang@amd.com>
Thu, 21 Dec 2017 07:48:27 +0000 (15:48 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 15 May 2018 18:43:37 +0000 (13:43 -0500)
Remove gfx_v9_0_enable_sck_slow_down_on_power_up/down and CP power gating
enabling functions because they only need to be called on setting power gating
behavior. We keep it in set_powergating callback to enable/disable PG in
late_init.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Acked-by: Hawking Zhang <Hawking.Zhang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

index 69370f0..eff1fd1 100644 (file)
@@ -2065,6 +2065,9 @@ static void gfx_v9_0_enable_gfx_dynamic_mg_power_gating(struct amdgpu_device *ad
 
 static void gfx_v9_0_init_pg(struct amdgpu_device *adev)
 {
+       if (!adev->gfx.rlc.is_rlc_v2_1)
+               return;
+
        if (adev->pg_flags & (AMD_PG_SUPPORT_GFX_PG |
                              AMD_PG_SUPPORT_GFX_SMG |
                              AMD_PG_SUPPORT_GFX_DMG |
@@ -2075,24 +2078,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)
                gfx_v9_0_init_rlc_save_restore_list(adev);
                gfx_v9_0_enable_save_restore_machine(adev);
 
-               if (adev->asic_type == CHIP_RAVEN) {
-                       WREG32(mmRLC_JUMP_TABLE_RESTORE,
-                               adev->gfx.rlc.cp_table_gpu_addr >> 8);
-                       gfx_v9_0_init_gfx_power_gating(adev);
-
-                       if (adev->pg_flags & AMD_PG_SUPPORT_RLC_SMU_HS) {
-                               gfx_v9_0_enable_sck_slow_down_on_power_up(adev, true);
-                               gfx_v9_0_enable_sck_slow_down_on_power_down(adev, true);
-                       } else {
-                               gfx_v9_0_enable_sck_slow_down_on_power_up(adev, false);
-                               gfx_v9_0_enable_sck_slow_down_on_power_down(adev, false);
-                       }
-
-                       if (adev->pg_flags & AMD_PG_SUPPORT_CP)
-                               gfx_v9_0_enable_cp_power_gating(adev, true);
-                       else
-                               gfx_v9_0_enable_cp_power_gating(adev, false);
-               }
+               WREG32(mmRLC_JUMP_TABLE_RESTORE,
+                      adev->gfx.rlc.cp_table_gpu_addr >> 8);
+               gfx_v9_0_init_gfx_power_gating(adev);
        }
 }