[PATCH] drm/amdgpu: Adding CAP firmware initialization

[Alex Deucher]

On Thu, Mar 16, 2023 at 4:36 AM Bill Liu <Bill.Liu at amd.com> wrote:
>
> Added CAP firmware initialization for PSP v13.0.10 under psp_init_sriov_microcode
>
> Signed-off-by: Bill Liu <Bill.Liu at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c   | 1 +
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 ++
>  2 files changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 02f948adae72..0b9e99c35a05 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -148,6 +148,7 @@ static int psp_init_sriov_microcode(struct psp_context *psp)
>                 break;
>         case IP_VERSION(13, 0, 10):
>                 adev->virt.autoload_ucode_id = AMDGPU_UCODE_ID_CP_MES1_DATA;
> +               ret = psp_init_cap_microcode(psp, ucode_prefix);
>                 break;
>         default:
>                 return -EINVAL;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> index 380b89114341..b59c92037375 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> @@ -669,6 +669,8 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)
>                 return "VCN1_RAM";
>         case AMDGPU_UCODE_ID_DMCUB:
>                 return "DMCUB";
> +       case AMDGPU_UCODE_ID_CAP:
> +               return "CAP";
>         default:
>                 return "UNKNOWN UCODE";
>         }
> --
> 2.34.1
>