diff options
| author | Lang Yu <[email protected]> | 2023-05-09 00:26:37 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2023-08-31 20:34:10 +0000 |
| commit | c5d67a0ec3cc05eb640729fb61dd8810ba317fba (patch) | |
| tree | f0e2dccd161596c356cc58baaee80f2aa9b783b0 /drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | |
| parent | drm/amdgpu: add VPE 6.1.0 support (diff) | |
| download | kernel-c5d67a0ec3cc05eb640729fb61dd8810ba317fba.tar.gz kernel-c5d67a0ec3cc05eb640729fb61dd8810ba317fba.zip | |
drm/amdgpu: add PSP loading support for VPE
Add PSP loading support for Video Processing Engine.
Signed-off-by: Lang Yu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c index f573a44d5d87..a84e03a9b0fc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c @@ -56,6 +56,22 @@ int amdgpu_vpe_init_microcode(struct amdgpu_vpe *vpe) adev->vpe.fw_version = le32_to_cpu(vpe_hdr->header.ucode_version); adev->vpe.feature_version = le32_to_cpu(vpe_hdr->ucode_feature_version); + if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) { + struct amdgpu_firmware_info *info; + + info = &adev->firmware.ucode[AMDGPU_UCODE_ID_VPE_CTX]; + info->ucode_id = AMDGPU_UCODE_ID_VPE_CTX; + info->fw = adev->vpe.fw; + adev->firmware.fw_size += + ALIGN(le32_to_cpu(vpe_hdr->ctx_ucode_size_bytes), PAGE_SIZE); + + info = &adev->firmware.ucode[AMDGPU_UCODE_ID_VPE_CTL]; + info->ucode_id = AMDGPU_UCODE_ID_VPE_CTL; + info->fw = adev->vpe.fw; + adev->firmware.fw_size += + ALIGN(le32_to_cpu(vpe_hdr->ctl_ucode_size_bytes), PAGE_SIZE); + } + return 0; out: dev_err(adev->dev, "fail to initialize vpe microcode\n"); |