drm/amd/powerplay: Unify smu handle task function (v2)

Unify power stade adjust function into smu_handle_task by the judgment
of task_id.
Move functions which have no relationship with smu version into the file
of amdgpu_smu.
Modified the function of smu_display_config_changed into two part.
Unify some similiar function.

v2: Correct the operation of upload dpm level when force dpm limit value.

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 28 insertions, 18 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index b83981284a7c..47d2ba528a0f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -2608,28 +2608,38 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
                         amdgpu_fence_wait_empty(ring);
         }
 
-        if (adev->powerplay.pp_funcs->dispatch_tasks) {
-                if (!amdgpu_device_has_dc_support(adev)) {
+        if (is_support_sw_smu(adev)) {
+                struct smu_context *smu = &adev->smu;
+                struct smu_dpm_context *smu_dpm = &adev->smu.smu_dpm;
+                mutex_lock(&(smu->mutex));
+                smu_handle_task(&adev->smu,
+                                smu_dpm->dpm_level,
+                                AMD_PP_TASK_DISPLAY_CONFIG_CHANGE);
+                mutex_unlock(&(smu->mutex));
+        } else {
+                if (adev->powerplay.pp_funcs->dispatch_tasks) {
+                        if (!amdgpu_device_has_dc_support(adev)) {
+                                mutex_lock(&adev->pm.mutex);
+                                amdgpu_dpm_get_active_displays(adev);
+                                adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtc_count;
+                                adev->pm.pm_display_cfg.vrefresh = amdgpu_dpm_get_vrefresh(adev);
+                                adev->pm.pm_display_cfg.min_vblank_time = amdgpu_dpm_get_vblank_time(adev);
+                                /* we have issues with mclk switching with refresh rates over 120 hz on the non-DC code. */
+                                if (adev->pm.pm_display_cfg.vrefresh > 120)
+                                        adev->pm.pm_display_cfg.min_vblank_time = 0;
+                                if (adev->powerplay.pp_funcs->display_configuration_change)
+                                        adev->powerplay.pp_funcs->display_configuration_change(
+                                                                        adev->powerplay.pp_handle,
+                                                                        &adev->pm.pm_display_cfg);
+                                mutex_unlock(&adev->pm.mutex);
+                        }
+                        amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_DISPLAY_CONFIG_CHANGE, NULL);
+                } else {
                         mutex_lock(&adev->pm.mutex);
                         amdgpu_dpm_get_active_displays(adev);
-                        adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtc_count;
-                        adev->pm.pm_display_cfg.vrefresh = amdgpu_dpm_get_vrefresh(adev);
-                        adev->pm.pm_display_cfg.min_vblank_time = amdgpu_dpm_get_vblank_time(adev);
-                        /* we have issues with mclk switching with refresh rates over 120 hz on the non-DC code. */
-                        if (adev->pm.pm_display_cfg.vrefresh > 120)
-                                adev->pm.pm_display_cfg.min_vblank_time = 0;
-                        if (adev->powerplay.pp_funcs->display_configuration_change)
-                                adev->powerplay.pp_funcs->display_configuration_change(
-                                                                adev->powerplay.pp_handle,
-                                                                &adev->pm.pm_display_cfg);
+                        amdgpu_dpm_change_power_state_locked(adev);
                         mutex_unlock(&adev->pm.mutex);
                 }
-                amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_DISPLAY_CONFIG_CHANGE, NULL);
-        } else {
-                mutex_lock(&adev->pm.mutex);
-                amdgpu_dpm_get_active_displays(adev);
-                amdgpu_dpm_change_power_state_locked(adev);
-                mutex_unlock(&adev->pm.mutex);
         }
 }