Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_psp.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index e69ad6e089c5b7b6dc0878a7ff8d0a504418a934..c027e5e7713ef821297d78127e035fff8e3732d8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -130,6 +130,8 @@ psp_cmd_submit_buf(struct psp_context *psp,
        int index;
        int timeout = 2000;
 
+       mutex_lock(&psp->mutex);
+
        memset(psp->cmd_buf_mem, 0, PSP_CMD_BUFFER_SIZE);
 
        memcpy(psp->cmd_buf_mem, cmd, sizeof(struct psp_gfx_cmd_resp));
@@ -139,6 +141,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
                             fence_mc_addr, index);
        if (ret) {
                atomic_dec(&psp->fence_value);
+               mutex_unlock(&psp->mutex);
                return ret;
        }
 
@@ -161,8 +164,10 @@ psp_cmd_submit_buf(struct psp_context *psp,
                                  ucode->ucode_id);
                DRM_WARN("psp command failed and response status is (%d)\n",
                          psp->cmd_buf_mem->resp.status);
-               if (!timeout)
+               if (!timeout) {
+                       mutex_unlock(&psp->mutex);
                        return -EINVAL;
+               }
        }
 
        /* get xGMI session id from response buffer */
@@ -172,6 +177,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
                ucode->tmr_mc_addr_lo = psp->cmd_buf_mem->resp.fw_addr_lo;
                ucode->tmr_mc_addr_hi = psp->cmd_buf_mem->resp.fw_addr_hi;
        }
+       mutex_unlock(&psp->mutex);
 
        return ret;
 }
@@ -763,6 +769,15 @@ static int psp_hw_start(struct psp_context *psp)
        int ret;
 
        if (!amdgpu_sriov_vf(adev) || !adev->in_gpu_reset) {
+               if (psp->kdb_bin_size &&
+                   (psp->funcs->bootloader_load_kdb != NULL)) {
+                       ret = psp_bootloader_load_kdb(psp);
+                       if (ret) {
+                               DRM_ERROR("PSP load kdb failed!\n");
+                               return ret;
+                       }
+               }
+
                ret = psp_bootloader_load_sysdrv(psp);
                if (ret) {
                        DRM_ERROR("PSP load sysdrv failed!\n");
@@ -1188,10 +1203,16 @@ static int psp_resume(void *handle)
 
 int psp_gpu_reset(struct amdgpu_device *adev)
 {
+       int ret;
+
        if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)
                return 0;
 
-       return psp_mode1_reset(&adev->psp);
+       mutex_lock(&adev->psp.mutex);
+       ret = psp_mode1_reset(&adev->psp);
+       mutex_unlock(&adev->psp.mutex);
+
+       return ret;
 }
 
 int psp_rlc_autoload_start(struct psp_context *psp)