drm/amd/powerplay: refine code in amd_powerplay.c (v2)

1. use flag PP_DPM_DISABLED within powerplay
   notify amdgpu dpm state by cgs interface.
2. delete redundant virtualization check in
   powerplay

v2: squash in fix for hwmgr_init (Rex)

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 0 insertions, 12 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 1649b1e3f23d..3b42f407971d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -98,10 +98,6 @@ static int amdgpu_pp_early_init(void *handle)
                                         amd_pp->cgs_device ? amd_pp->cgs_device :
                                         amd_pp->pp_handle);
 
-        if (ret == PP_DPM_DISABLED) {
-                adev->pm.dpm_enabled = false;
-                return 0;
-        }
         return ret;
 }
 
@@ -154,14 +150,6 @@ static int amdgpu_pp_hw_init(void *handle)
                 ret = adev->powerplay.ip_funcs->hw_init(
                                         adev->powerplay.pp_handle);
 
-        if (ret == PP_DPM_DISABLED) {
-                adev->pm.dpm_enabled = false;
-                return 0;
-        }
-
-        if ((amdgpu_dpm != 0) && !amdgpu_sriov_vf(adev))
-                adev->pm.dpm_enabled = true;
-
         return ret;
 }