drm/amd/pm: fix SMU13 runpm hang due to unintentional workaround

The workaround designed for some specific ASICs is wrongly applied
to SMU13 ASICs. That leads to some runpm hang.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 9492dd6..20e5f66 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1156,22 +1156,21 @@ static int smu_smc_hw_setup(struct smu_context *smu)
        uint64_t features_supported;
        int ret = 0;
 
-       if (adev->in_suspend && smu_is_dpm_running(smu)) {
-               dev_info(adev->dev, "dpm has been enabled\n");
-               /* this is needed specifically */
-               switch (adev->ip_versions[MP1_HWIP][0]) {
-               case IP_VERSION(11, 0, 7):
-               case IP_VERSION(11, 0, 11):
-               case IP_VERSION(11, 5, 0):
-               case IP_VERSION(11, 0, 12):
+       switch (adev->ip_versions[MP1_HWIP][0]) {
+       case IP_VERSION(11, 0, 7):
+       case IP_VERSION(11, 0, 11):
+       case IP_VERSION(11, 5, 0):
+       case IP_VERSION(11, 0, 12):
+               if (adev->in_suspend && smu_is_dpm_running(smu)) {
+                       dev_info(adev->dev, "dpm has been enabled\n");
                        ret = smu_system_features_control(smu, true);
                        if (ret)
                                dev_err(adev->dev, "Failed system features control!\n");
-                       break;
-               default:
-                       break;
+                       return ret;
                }
-               return ret;
+               break;
+       default:
+               break;
        }
 
        ret = smu_init_display_count(smu, 0);