drm/amdgpu: fix ordering of psp suspend

The ordering of psp_tmr_terminate() and psp_asd_unload()
got reversed when the patches were applied to stable.

This patch does not exist in Linus' tree because the ordering
is correct there.  It got reversed when the patches were applied
to stable.  This patch is for stable only.

Fixes: 22ff658396b446 ("drm/amdgpu: asd function needs to be unloaded in suspend phase")
Fixes: 2c41c968c6f648 ("drm/amdgpu: add TMR destory function for psp")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.7.x
Cc: Huang Rui <ray.huang@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 3c6f60c5b1a5a175cb1be9edef5fd31b301c93b8..088f43ebdceb60219962df5815a954fe90a11388 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -1679,15 +1679,15 @@ static int psp_suspend(void *handle)
                }
        }
 
-       ret = psp_tmr_terminate(psp);
+       ret = psp_asd_unload(psp);
        if (ret) {
-               DRM_ERROR("Falied to terminate tmr\n");
+               DRM_ERROR("Failed to unload asd\n");
                return ret;
        }
 
-       ret = psp_asd_unload(psp);
+       ret = psp_tmr_terminate(psp);
        if (ret) {
-               DRM_ERROR("Failed to unload asd\n");
+               DRM_ERROR("Falied to terminate tmr\n");
                return ret;
        }