Commit d73cd701 authored by Emily Deng's avatar Emily Deng Committed by Alex Deucher

drm/amdgpu: Ignore the not supported error from psp

As the VCN firmware will not use
vf vmr now. And new psp policy won't support set tmr
now.
For driver compatible issue, ignore the not support error.
Signed-off-by: default avatarEmily Deng <Emily.Deng@amd.com>
Reviewed-by: default avatarMonk Liu <monk.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6bc8cdde
...@@ -201,6 +201,7 @@ psp_cmd_submit_buf(struct psp_context *psp, ...@@ -201,6 +201,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
int index; int index;
int timeout = 2000; int timeout = 2000;
bool ras_intr = false; bool ras_intr = false;
bool skip_unsupport = false;
mutex_lock(&psp->mutex); mutex_lock(&psp->mutex);
...@@ -232,6 +233,9 @@ psp_cmd_submit_buf(struct psp_context *psp, ...@@ -232,6 +233,9 @@ psp_cmd_submit_buf(struct psp_context *psp,
amdgpu_asic_invalidate_hdp(psp->adev, NULL); amdgpu_asic_invalidate_hdp(psp->adev, NULL);
} }
/* We allow TEE_ERROR_NOT_SUPPORTED for VMR command in SRIOV */
skip_unsupport = (psp->cmd_buf_mem->resp.status == 0xffff000a) && amdgpu_sriov_vf(psp->adev);
/* In some cases, psp response status is not 0 even there is no /* In some cases, psp response status is not 0 even there is no
* problem while the command is submitted. Some version of PSP FW * problem while the command is submitted. Some version of PSP FW
* doesn't write 0 to that field. * doesn't write 0 to that field.
...@@ -239,7 +243,7 @@ psp_cmd_submit_buf(struct psp_context *psp, ...@@ -239,7 +243,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
* during psp initialization to avoid breaking hw_init and it doesn't * during psp initialization to avoid breaking hw_init and it doesn't
* return -EINVAL. * return -EINVAL.
*/ */
if ((psp->cmd_buf_mem->resp.status || !timeout) && !ras_intr) { if (!skip_unsupport && (psp->cmd_buf_mem->resp.status || !timeout) && !ras_intr) {
if (ucode) if (ucode)
DRM_WARN("failed to load ucode id (%d) ", DRM_WARN("failed to load ucode id (%d) ",
ucode->ucode_id); ucode->ucode_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment