There isn't ucode when executing INVOKE command, so current code can't
check the failure of INVOKE command.

Remove the ucode check.

Signed-off-by: Xiangliang Yu <xiangliang...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 2f126ea7..7f5ce37 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -140,10 +140,13 @@ psp_cmd_submit_buf(struct psp_context *psp,
        while (*((unsigned int *)psp->fence_buf) != index)
                msleep(1);
 
-       /* the status field must be 0 after FW is loaded */
-       if (ucode && psp->cmd_buf_mem->resp.status) {
-               DRM_ERROR("failed loading with status (%d) and ucode id (%d)\n",
-                         psp->cmd_buf_mem->resp.status, ucode->ucode_id);
+       /* the status field must be 0 after psp command completion */
+       if (psp->cmd_buf_mem->resp.status) {
+               if (ucode)
+                       DRM_ERROR("failed to load ucode id (%d) ",
+                                 ucode->ucode_id);
+               DRM_ERROR("psp command failed and response status is (%d)\n",
+                         psp->cmd_buf_mem->resp.status);
                return -EINVAL;
        }
 
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to