[PATCH 4/4] SWDEV-226663 - Ignore the not supported error from psp

[Alex Deucher]

On Wed, Mar 25, 2020 at 4:33 AM Emily Deng <Emily.Deng at amd.com> wrote:
>
> 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: Emily Deng <Emily.Deng at amd.com>

Please fix the patch title.  With that fixed:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index c2bf2d9..1a46050 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -205,6 +205,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
>         int index;
>         int timeout = 2000;
>         bool ras_intr = false;
> +       bool skip_unsupport = false;
>
>         mutex_lock(&psp->mutex);
>
> @@ -236,6 +237,9 @@ psp_cmd_submit_buf(struct psp_context *psp,
>                 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
>          * problem while the command is submitted. Some version of PSP FW
>          * doesn't write 0 to that field.
> @@ -243,7 +247,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
>          * during psp initialization to avoid breaking hw_init and it doesn't
>          * 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)
>                         DRM_WARN("failed to load ucode id (%d) ",
>                                   ucode->ucode_id);
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx