[PATCH 3/3] drm/amd/pm: move NAVI1X power mode switching workaround to post_init

[Evan Quan]

Since that should be the correct place to put ASIC specific
workarounds.

Change-Id: Ia7cf4bfabf85a4409e57542926238c7e196af719
Signed-off-by: Evan Quan <evan.q...@amd.com>
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     | 14 -------------
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 20 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c 
b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 35258f980de5..5fa80f8e6b44 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1013,20 +1013,6 @@ static int smu_smc_hw_setup(struct smu_context *smu)
                return ret;
        }
 
-       if (!smu->dc_controlled_by_gpio) {
-               /*
-                * For Navi1X, manually switch it to AC mode as PMFW
-                * may boot it with DC mode.
-                */
-               ret = smu_set_power_source(smu,
-                                          adev->pm.ac_power ? 
SMU_POWER_SOURCE_AC :
-                                          SMU_POWER_SOURCE_DC);
-               if (ret) {
-                       dev_err(adev->dev, "Failed to switch to %s mode!\n", 
adev->pm.ac_power ? "AC" : "DC");
-                       return ret;
-               }
-       }
-
        ret = smu_notify_display_change(smu);
        if (ret)
                return ret;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index e82e20f85ef0..42645e2f5419 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
@@ -2701,8 +2701,26 @@ static int navi10_post_smu_init(struct smu_context *smu)
        }
 
        ret = navi10_run_umc_cdr_workaround(smu);
-       if (ret)
+       if (ret) {
                dev_err(adev->dev, "Failed to apply umc cdr workaround!\n");
+               return ret;
+       }
+
+       if (!smu->dc_controlled_by_gpio) {
+               /*
+                * For Navi1X, manually switch it to AC mode as PMFW
+                * may boot it with DC mode.
+                */
+               ret = smu_v11_0_set_power_source(smu,
+                                                adev->pm.ac_power ?
+                                                SMU_POWER_SOURCE_AC :
+                                                SMU_POWER_SOURCE_DC);
+               if (ret) {
+                       dev_err(adev->dev, "Failed to switch to %s mode!\n",
+                                       adev->pm.ac_power ? "AC" : "DC");
+                       return ret;
+               }
+       }
 
        return ret;
 }
-- 
2.28.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx