drm/amdgpu: Use real power source in powerplay instand of hardcode

1. move ac_power to struct pm from dpm, so can be shared with powerplay
2. remove power_source in powerplay, use adev->pm.ac_power instand.
3. update ac_power before dispatch power task.

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>

5 files changed, 21 insertions, 20 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
index dd6203a0a6b7..9acfbee91c40 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
@@ -402,7 +402,6 @@ struct amdgpu_dpm {
         u32 tdp_adjustment;
         u16 load_line_slope;
         bool power_control;
-        bool ac_power;
         /* special states active */
         bool                    thermal_active;
         bool                    uvd_active;
@@ -439,6 +438,7 @@ struct amdgpu_pm {
         struct amd_pp_display_configuration pm_display_cfg;/* set by dc */
         uint32_t                smu_prv_buffer_size;
         struct amdgpu_bo        *smu_prv_buffer;
+        bool ac_power;
 };
 
 #define R600_SSTU_DFLT                               0
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index f667cb9eb614..113edffb5960 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -68,11 +68,11 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev)
         if (adev->pm.dpm_enabled) {
                 mutex_lock(&adev->pm.mutex);
                 if (power_supply_is_system_supplied() > 0)
-                        adev->pm.dpm.ac_power = true;
+                        adev->pm.ac_power = true;
                 else
-                        adev->pm.dpm.ac_power = false;
+                        adev->pm.ac_power = false;
                 if (adev->powerplay.pp_funcs->enable_bapm)
-                        amdgpu_dpm_enable_bapm(adev, adev->pm.dpm.ac_power);
+                        amdgpu_dpm_enable_bapm(adev, adev->pm.ac_power);
                 mutex_unlock(&adev->pm.mutex);
         }
 }
@@ -1907,6 +1907,14 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
                         amdgpu_fence_wait_empty(ring);
         }
 
+        mutex_lock(&adev->pm.mutex);
+        /* update battery/ac status */
+        if (power_supply_is_system_supplied() > 0)
+                adev->pm.ac_power = true;
+        else
+                adev->pm.ac_power = false;
+        mutex_unlock(&adev->pm.mutex);
+
         if (adev->powerplay.pp_funcs->dispatch_tasks) {
                 if (!amdgpu_device_has_dc_support(adev)) {
                         mutex_lock(&adev->pm.mutex);
@@ -1927,14 +1935,7 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
         } else {
                 mutex_lock(&adev->pm.mutex);
                 amdgpu_dpm_get_active_displays(adev);
-                /* update battery/ac status */
-                if (power_supply_is_system_supplied() > 0)
-                        adev->pm.dpm.ac_power = true;
-                else
-                        adev->pm.dpm.ac_power = false;
-
                 amdgpu_dpm_change_power_state_locked(adev);
-
                 mutex_unlock(&adev->pm.mutex);
         }
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index a266dcf5daed..b6248c0578a1 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -951,12 +951,12 @@ static void ci_apply_state_adjust_rules(struct amdgpu_device *adev,
         else
                 pi->battery_state = false;
 
-        if (adev->pm.dpm.ac_power)
+        if (adev->pm.ac_power)
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
         else
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_dc;
 
-        if (adev->pm.dpm.ac_power == false) {
+        if (adev->pm.ac_power == false) {
                 for (i = 0; i < ps->performance_level_count; i++) {
                         if (ps->performance_levels[i].mclk > max_limits->mclk)
                                 ps->performance_levels[i].mclk = max_limits->mclk;
@@ -4078,7 +4078,7 @@ static int ci_enable_uvd_dpm(struct amdgpu_device *adev, bool enable)
         const struct amdgpu_clock_and_voltage_limits *max_limits;
         int i;
 
-        if (adev->pm.dpm.ac_power)
+        if (adev->pm.ac_power)
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
         else
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_dc;
@@ -4127,7 +4127,7 @@ static int ci_enable_vce_dpm(struct amdgpu_device *adev, bool enable)
         const struct amdgpu_clock_and_voltage_limits *max_limits;
         int i;
 
-        if (adev->pm.dpm.ac_power)
+        if (adev->pm.ac_power)
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
         else
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_dc;
@@ -4160,7 +4160,7 @@ static int ci_enable_samu_dpm(struct amdgpu_device *adev, bool enable)
         const struct amdgpu_clock_and_voltage_limits *max_limits;
         int i;
 
-        if (adev->pm.dpm.ac_power)
+        if (adev->pm.ac_power)
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
         else
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_dc;
@@ -4191,7 +4191,7 @@ static int ci_enable_acp_dpm(struct amdgpu_device *adev, bool enable)
         const struct amdgpu_clock_and_voltage_limits *max_limits;
         int i;
 
-        if (adev->pm.dpm.ac_power)
+        if (adev->pm.ac_power)
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
         else
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_dc;
diff --git a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
index 17f7f074cedc..d79e6f5234da 100644
--- a/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/kv_dpm.c
@@ -1921,7 +1921,7 @@ static int kv_dpm_set_power_state(void *handle)
         int ret;
 
         if (pi->bapm_enable) {
-                ret = amdgpu_kv_smc_bapm_enable(adev, adev->pm.dpm.ac_power);
+                ret = amdgpu_kv_smc_bapm_enable(adev, adev->pm.ac_power);
                 if (ret) {
                         DRM_ERROR("amdgpu_kv_smc_bapm_enable failed\n");
                         return ret;
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index b12d7c9d42a0..9567dd0a01bc 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -3480,7 +3480,7 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev,
                 disable_sclk_switching = true;
         }
 
-        if (adev->pm.dpm.ac_power)
+        if (adev->pm.ac_power)
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
         else
                 max_limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_dc;
@@ -3489,7 +3489,7 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev,
                 if (ps->performance_levels[i].vddc > ps->performance_levels[i+1].vddc)
                         ps->performance_levels[i].vddc = ps->performance_levels[i+1].vddc;
         }
-        if (adev->pm.dpm.ac_power == false) {
+        if (adev->pm.ac_power == false) {
                 for (i = 0; i < ps->performance_level_count; i++) {
                         if (ps->performance_levels[i].mclk > max_limits->mclk)
                                 ps->performance_levels[i].mclk = max_limits->mclk;