drm/amdgpu/swSMU: set AC/DC mode based on the current system state (v2)

Check of the pointer exists and we are actually on AC power.

v2: fix error message to reflect AC/DC mode.

Bug: https://gitlab.freedesktop.org/drm/amd/issues/1043
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index 2cfb911ab370d359d3121e4b26d088a3af6517e0..9a9eb23d8540377304ae41737fae75868d1cb9f5 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -1155,17 +1155,17 @@ static int smu_smc_table_hw_init(struct smu_context *smu,
                        }
                }
 
-               if (adev->asic_type >= CHIP_NAVI10 &&
-                   adev->asic_type <= CHIP_NAVI12) {
+               if (smu->ppt_funcs->set_power_source) {
                        /*
                         * For Navi1X, manually switch it to AC mode as PMFW
                         * may boot it with DC mode.
-                        * TODO: should check whether we are indeed under AC
-                        * mode before doing this.
                         */
-                       ret = smu_set_power_source(smu, SMU_POWER_SOURCE_AC);
+                       if (adev->pm.ac_power)
+                               ret = smu_set_power_source(smu, SMU_POWER_SOURCE_AC);
+                       else
+                               ret = smu_set_power_source(smu, SMU_POWER_SOURCE_DC);
                        if (ret) {
-                               pr_err("Failed to switch to AC mode!\n");
+                               pr_err("Failed to switch to %s mode!\n", adev->pm.ac_power ? "AC" : "DC");
                                return ret;
                        }
                }