1 files changed, 145 insertions, 184 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 7df503aedb69..a59e04f3eeba 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -64,17 +64,13 @@ static const struct cg_flag_name clocks[] = {
 
 void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev)
 {
-        if (adev->pp_enabled)
-                /* TODO */
-                return;
-
         if (adev->pm.dpm_enabled) {
                 mutex_lock(&adev->pm.mutex);
                 if (power_supply_is_system_supplied() > 0)
                         adev->pm.dpm.ac_power = true;
                 else
                         adev->pm.dpm.ac_power = false;
-                if (adev->pm.funcs->enable_bapm)
+                if (adev->powerplay.pp_funcs->enable_bapm)
                         amdgpu_dpm_enable_bapm(adev, adev->pm.dpm.ac_power);
                 mutex_unlock(&adev->pm.mutex);
         }
@@ -88,9 +84,9 @@ static ssize_t amdgpu_get_dpm_state(struct device *dev,
         struct amdgpu_device *adev = ddev->dev_private;
         enum amd_pm_state_type pm;
 
-        if (adev->pp_enabled) {
+        if (adev->powerplay.pp_funcs->get_current_power_state)
                 pm = amdgpu_dpm_get_current_power_state(adev);
-        } else
+        else
                 pm = adev->pm.dpm.user_state;
 
         return snprintf(buf, PAGE_SIZE, "%s\n",
@@ -118,8 +114,8 @@ static ssize_t amdgpu_set_dpm_state(struct device *dev,
                 goto fail;
         }
 
-        if (adev->pp_enabled) {
-                amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_ENABLE_USER_STATE, &state, NULL);
+        if (adev->powerplay.pp_funcs->dispatch_tasks) {
+                amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_ENABLE_USER_STATE, &state, NULL);
         } else {
                 mutex_lock(&adev->pm.mutex);
                 adev->pm.dpm.user_state = state;
@@ -140,13 +136,17 @@ static ssize_t amdgpu_get_dpm_forced_performance_level(struct device *dev,
 {
         struct drm_device *ddev = dev_get_drvdata(dev);
         struct amdgpu_device *adev = ddev->dev_private;
-        enum amd_dpm_forced_level level;
+        enum amd_dpm_forced_level level = 0xff;
 
         if  ((adev->flags & AMD_IS_PX) &&
              (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
                 return snprintf(buf, PAGE_SIZE, "off\n");
 
-        level = amdgpu_dpm_get_performance_level(adev);
+        if (adev->powerplay.pp_funcs->get_performance_level)
+                level = amdgpu_dpm_get_performance_level(adev);
+        else
+                level = adev->pm.dpm.forced_level;
+
         return snprintf(buf, PAGE_SIZE, "%s\n",
                         (level == AMD_DPM_FORCED_LEVEL_AUTO) ? "auto" :
                         (level == AMD_DPM_FORCED_LEVEL_LOW) ? "low" :
@@ -167,7 +167,7 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
         struct drm_device *ddev = dev_get_drvdata(dev);
         struct amdgpu_device *adev = ddev->dev_private;
         enum amd_dpm_forced_level level;
-        enum amd_dpm_forced_level current_level;
+        enum amd_dpm_forced_level current_level = 0xff;
         int ret = 0;
 
         /* Can't force performance level when the card is off */
@@ -175,7 +175,8 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
              (ddev->switch_power_state != DRM_SWITCH_POWER_ON))
                 return -EINVAL;
 
-        current_level = amdgpu_dpm_get_performance_level(adev);
+        if (adev->powerplay.pp_funcs->get_performance_level)
+                current_level = amdgpu_dpm_get_performance_level(adev);
 
         if (strncmp("low", buf, strlen("low")) == 0) {
                 level = AMD_DPM_FORCED_LEVEL_LOW;
@@ -203,9 +204,7 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev,
         if (current_level == level)
                 return count;
 
-        if (adev->pp_enabled)
-                amdgpu_dpm_force_performance_level(adev, level);
-        else {
+        if (adev->powerplay.pp_funcs->force_performance_level) {
                 mutex_lock(&adev->pm.mutex);
                 if (adev->pm.dpm.thermal_active) {
                         count = -EINVAL;
@@ -233,7 +232,7 @@ static ssize_t amdgpu_get_pp_num_states(struct device *dev,
         struct pp_states_info data;
         int i, buf_len;
 
-        if (adev->pp_enabled)
+        if (adev->powerplay.pp_funcs->get_pp_num_states)
                 amdgpu_dpm_get_pp_num_states(adev, &data);
 
         buf_len = snprintf(buf, PAGE_SIZE, "states: %d\n", data.nums);
@@ -257,8 +256,8 @@ static ssize_t amdgpu_get_pp_cur_state(struct device *dev,
         enum amd_pm_state_type pm = 0;
         int i = 0;
 
-        if (adev->pp_enabled) {
-
+        if (adev->powerplay.pp_funcs->get_current_power_state
+                 && adev->powerplay.pp_funcs->get_pp_num_states) {
                 pm = amdgpu_dpm_get_current_power_state(adev);
                 amdgpu_dpm_get_pp_num_states(adev, &data);
 
@@ -280,25 +279,10 @@ static ssize_t amdgpu_get_pp_force_state(struct device *dev,
 {
         struct drm_device *ddev = dev_get_drvdata(dev);
         struct amdgpu_device *adev = ddev->dev_private;
-        struct pp_states_info data;
-        enum amd_pm_state_type pm = 0;
-        int i;
 
-        if (adev->pp_force_state_enabled && adev->pp_enabled) {
-                pm = amdgpu_dpm_get_current_power_state(adev);
-                amdgpu_dpm_get_pp_num_states(adev, &data);
-
-                for (i = 0; i < data.nums; i++) {
-                        if (pm == data.states[i])
-                                break;
-                }
-
-                if (i == data.nums)
-                        i = -EINVAL;
-
-                return snprintf(buf, PAGE_SIZE, "%d\n", i);
-
-        } else
+        if (adev->pp_force_state_enabled)
+                return amdgpu_get_pp_cur_state(dev, attr, buf);
+        else
                 return snprintf(buf, PAGE_SIZE, "\n");
 }
 
@@ -315,7 +299,8 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
 
         if (strlen(buf) == 1)
                 adev->pp_force_state_enabled = false;
-        else if (adev->pp_enabled) {
+        else if (adev->powerplay.pp_funcs->dispatch_tasks &&
+                        adev->powerplay.pp_funcs->get_pp_num_states) {
                 struct pp_states_info data;
 
                 ret = kstrtoul(buf, 0, &idx);
@@ -330,7 +315,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
                 if (state != POWER_STATE_TYPE_INTERNAL_BOOT &&
                     state != POWER_STATE_TYPE_DEFAULT) {
                         amdgpu_dpm_dispatch_task(adev,
-                                        AMD_PP_EVENT_ENABLE_USER_STATE, &state, NULL);
+                                        AMD_PP_TASK_ENABLE_USER_STATE, &state, NULL);