1 files changed, 6 insertions, 54 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 2d2f0960b025..3b42f407971d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -34,24 +34,6 @@
 #include "cik_dpm.h"
 #include "vi_dpm.h"
 
-static int amdgpu_create_pp_handle(struct amdgpu_device *adev)
-{
-        struct amd_pp_init pp_init;
-        struct amd_powerplay *amd_pp;
-        int ret;
-
-        amd_pp = &(adev->powerplay);
-        pp_init.chip_family = adev->family;
-        pp_init.chip_id = adev->asic_type;
-        pp_init.pm_en = (amdgpu_dpm != 0 && !amdgpu_sriov_vf(adev)) ? true : false;
-        pp_init.feature_mask = amdgpu_pp_feature_mask;
-        pp_init.device = amdgpu_cgs_create_device(adev);
-        ret = amd_powerplay_create(&pp_init, &(amd_pp->pp_handle));
-        if (ret)
-                return -EINVAL;
-        return 0;
-}
-
 static int amdgpu_pp_early_init(void *handle)
 {
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -59,7 +41,6 @@ static int amdgpu_pp_early_init(void *handle)
         int ret = 0;
 
         amd_pp = &(adev->powerplay);
-        adev->pp_enabled = false;
         amd_pp->pp_handle = (void *)adev;
 
         switch (adev->asic_type) {
@@ -73,9 +54,7 @@ static int amdgpu_pp_early_init(void *handle)
         case CHIP_STONEY:
         case CHIP_VEGA10:
         case CHIP_RAVEN:
-                adev->pp_enabled = true;
-                if (amdgpu_create_pp_handle(adev))
-                        return -EINVAL;
+                amd_pp->cgs_device = amdgpu_cgs_create_device(adev);
                 amd_pp->ip_funcs = &pp_ip_funcs;
                 amd_pp->pp_funcs = &pp_dpm_funcs;
                 break;
@@ -97,9 +76,7 @@ static int amdgpu_pp_early_init(void *handle)
                         amd_pp->ip_funcs = &ci_dpm_ip_funcs;
                         amd_pp->pp_funcs = &ci_dpm_funcs;
                 } else {
-                        adev->pp_enabled = true;
-                        if (amdgpu_create_pp_handle(adev))
-                                return -EINVAL;
+                        amd_pp->cgs_device = amdgpu_cgs_create_device(adev);
                         amd_pp->ip_funcs = &pp_ip_funcs;
                         amd_pp->pp_funcs = &pp_dpm_funcs;
                 }
@@ -118,12 +95,9 @@ static int amdgpu_pp_early_init(void *handle)
 
         if (adev->powerplay.ip_funcs->early_init)
                 ret = adev->powerplay.ip_funcs->early_init(
-                                        adev->powerplay.pp_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;
 }
 
@@ -137,11 +111,6 @@ static int amdgpu_pp_late_init(void *handle)
                 ret = adev->powerplay.ip_funcs->late_init(
                                         adev->powerplay.pp_handle);
 
-        if (adev->pp_enabled && adev->pm.dpm_enabled) {
-                amdgpu_pm_sysfs_init(adev);
-                amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_COMPLETE_INIT, NULL, NULL);
-        }
-
         return ret;
 }
 
@@ -176,21 +145,11 @@ static int amdgpu_pp_hw_init(void *handle)
         int ret = 0;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-        if (adev->pp_enabled && adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)
-                amdgpu_ucode_init_bo(adev);
 
         if (adev->powerplay.ip_funcs->hw_init)
                 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;
 }
 
@@ -199,16 +158,10 @@ static int amdgpu_pp_hw_fini(void *handle)
         int ret = 0;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-        if (adev->pp_enabled && adev->pm.dpm_enabled)
-                amdgpu_pm_sysfs_fini(adev);
-
         if (adev->powerplay.ip_funcs->hw_fini)
                 ret = adev->powerplay.ip_funcs->hw_fini(
                                         adev->powerplay.pp_handle);
 
-        if (adev->pp_enabled && adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)
-                amdgpu_ucode_fini_bo(adev);
-
         return ret;
 }
 
@@ -220,9 +173,8 @@ static void amdgpu_pp_late_fini(void *handle)
                 adev->powerplay.ip_funcs->late_fini(
                           adev->powerplay.pp_handle);
 
-
-        if (adev->pp_enabled)
-                amd_powerplay_destroy(adev->powerplay.pp_handle);
+        if (adev->powerplay.cgs_device)
+                amdgpu_cgs_destroy_device(adev->powerplay.cgs_device);
 }
 
 static int amdgpu_pp_suspend(void *handle)