1 files changed, 12 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 76f531b8e97b..2157d4509e84 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -334,23 +334,26 @@ static int psp_load_fw(struct amdgpu_device *adev)
         int ret;
         struct psp_context *psp = &adev->psp;
 
+        if (amdgpu_sriov_vf(adev) && adev->in_gpu_reset != 0)
+                goto skip_memalloc;
+
         psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
         if (!psp->cmd)
                 return -ENOMEM;
 
         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);
+                                        AMDGPU_GEM_DOMAIN_GTT,
+                                        &psp->fw_pri_bo,
+                                        &psp->fw_pri_mc_addr,
+                                        &psp->fw_pri_buf);
         if (ret)
                 goto failed;
 
         ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE,
-                                      AMDGPU_GEM_DOMAIN_VRAM,
-                                      &psp->fence_buf_bo,
-                                      &psp->fence_buf_mc_addr,
-                                      &psp->fence_buf);
+                                        AMDGPU_GEM_DOMAIN_VRAM,
+                                        &psp->fence_buf_bo,
+                                        &psp->fence_buf_mc_addr,
+                                        &psp->fence_buf);
         if (ret)
                 goto failed_mem2;
 
@@ -375,6 +378,7 @@ static int psp_load_fw(struct amdgpu_device *adev)
         if (ret)
                 goto failed_mem;
 
+skip_memalloc:
         ret = psp_hw_start(psp);
         if (ret)
                 goto failed_mem;