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

commit 4b14841c9a820e484bc8c4c3f5a6fed1bc528cbc upstream.

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>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 7510d470b86439c2269c9470176054823c638103..2347f7bb73d7690e57b90dd238bcc1f97b9c0121 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1131,22 +1131,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);