drm/amdgpu: add psp firmware private memory

Needed for proper suspend support.

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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 6aba417b7c954c5fd30569077c525079481438a5..f70ab550934c67b7e7199b2e8c84afdceade161d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -275,17 +275,25 @@ static int psp_load_fw(struct amdgpu_device *adev)
        if (!cmd)
                return -ENOMEM;
 
-       ret = psp_bootloader_load_sysdrv(psp);
+       ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
+                                     AMDGPU_GEM_DOMAIN_GTT,
+                                     &psp->fw_pri_bo,
+                                     &psp->fw_pri_mc_addr,
+                                     &psp->fw_pri_buf);
        if (ret)
                goto failed;
 
+       ret = psp_bootloader_load_sysdrv(psp);
+       if (ret)
+               goto failed_mem1;
+
        ret = psp_bootloader_load_sos(psp);
        if (ret)
-               goto failed;
+               goto failed_mem1;
 
        ret = psp_ring_init(psp, PSP_RING_TYPE__KM);
        if (ret)
-               goto failed;
+               goto failed_mem1;
 
        ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE,
                                      AMDGPU_GEM_DOMAIN_VRAM,
@@ -293,7 +301,7 @@ static int psp_load_fw(struct amdgpu_device *adev)
                                      &psp->fence_buf_mc_addr,
                                      &psp->fence_buf);
        if (ret)
-               goto failed;
+               goto failed_mem1;
 
        memset(psp->fence_buf, 0, PSP_FENCE_BUFFER_SIZE);
 
@@ -343,6 +351,9 @@ static int psp_load_fw(struct amdgpu_device *adev)
 failed_mem:
        amdgpu_bo_free_kernel(&psp->fence_buf_bo,
                              &psp->fence_buf_mc_addr, &psp->fence_buf);
+failed_mem1:
+       amdgpu_bo_free_kernel(&psp->fw_pri_bo,
+                             &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
 failed:
        kfree(cmd);
        return ret;
@@ -392,6 +403,10 @@ static int psp_hw_fini(void *handle)
        if (psp->tmr_buf)
                amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
 
+       if (psp->fw_pri_buf)
+               amdgpu_bo_free_kernel(&psp->fw_pri_bo,
+                                     &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
+
        return 0;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index e9f35e025b59f88d3e6515e76eb1df7ab3e4ff34..b309b6a62c651db4174c6fe2cea9e85fab95e2a8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -32,6 +32,7 @@
 #define PSP_CMD_BUFFER_SIZE    0x1000
 #define PSP_ASD_BIN_SIZE       0x40000
 #define PSP_ASD_SHARED_MEM_SIZE        0x4000
+#define PSP_1_MEG              0x100000
 
 enum psp_ring_type
 {
@@ -71,6 +72,11 @@ struct psp_context
                                  enum AMDGPU_UCODE_ID ucode_type);
        bool (*smu_reload_quirk)(struct psp_context *psp);
 
+       /* fence buffer */
+       struct amdgpu_bo                *fw_pri_bo;
+       uint64_t                        fw_pri_mc_addr;
+       void                            *fw_pri_buf;
+
        /* sos firmware */
        const struct firmware           *sos_fw;
        uint32_t                        sos_fw_version;