drm/amdgpu: split psp tmr init function

Rework in order to properly support suspend.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 17 insertions, 10 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index ed6e5799016e..6aba417b7c95 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -152,11 +152,6 @@ static void psp_prep_tmr_cmd_buf(struct psp_gfx_cmd_resp *cmd,
 static int psp_tmr_init(struct psp_context *psp)
 {
         int ret;
-        struct psp_gfx_cmd_resp *cmd;
-
-        cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
-        if (!cmd)
-                return -ENOMEM;
 
         /*
          * Allocate 3M memory aligned to 1M from Frame Buffer (local
@@ -168,22 +163,30 @@ static int psp_tmr_init(struct psp_context *psp)
         ret = amdgpu_bo_create_kernel(psp->adev, 0x300000, 0x100000,
                                       AMDGPU_GEM_DOMAIN_VRAM,
                                       &psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
-        if (ret)
-                goto failed;
+
+        return ret;
+}
+
+static int psp_tmr_load(struct psp_context *psp)
+{
+        int ret;
+        struct psp_gfx_cmd_resp *cmd;
+
+        cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
+        if (!cmd)
+                return -ENOMEM;
 
         psp_prep_tmr_cmd_buf(cmd, psp->tmr_mc_addr, 0x300000);
 
         ret = psp_cmd_submit_buf(psp, NULL, cmd,
                                  psp->fence_buf_mc_addr, 1);
         if (ret)
-                goto failed_mem;
+                goto failed;
 
         kfree(cmd);
 
         return 0;
 
-failed_mem:
-        amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
 failed:
         kfree(cmd);
         return ret;
@@ -298,6 +301,10 @@ static int psp_load_fw(struct amdgpu_device *adev)
         if (ret)
                 goto failed_mem;
 
+        ret = psp_tmr_load(psp);
+        if (ret)
+                goto failed_mem;
+
         ret = psp_asd_load(psp);
         if (ret)
                 goto failed_mem;