diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3757-drm-amdgpu-add-firmware-header-printing-for-psp-fw-l.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3757-drm-amdgpu-add-firmware-header-printing-for-psp-fw-l.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3757-drm-amdgpu-add-firmware-header-printing-for-psp-fw-l.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3757-drm-amdgpu-add-firmware-header-printing-for-psp-fw-l.patch new file mode 100644 index 00000000..6cbd6cb5 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3757-drm-amdgpu-add-firmware-header-printing-for-psp-fw-l.patch @@ -0,0 +1,90 @@ +From fbd68c2a230e881accece28476734e597a534693 Mon Sep 17 00:00:00 2001 +From: Xiaojie Yuan <xiaojie.yuan@amd.com> +Date: Thu, 15 Aug 2019 17:44:22 +0800 +Subject: [PATCH 3757/4256] drm/amdgpu: add firmware header printing for psp fw + loading + +firmware header information is printed for direct fw loading but not +added for psp fw loading yet + +Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 54 +++++++++++++++++++++++++ + 1 file changed, 54 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +index 52b02ce626e1..e50dd3c320c5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +@@ -942,6 +942,58 @@ static int psp_get_fw_type(struct amdgpu_firmware_info *ucode, + return 0; + } + ++static void psp_print_fw_hdr(struct psp_context *psp, ++ struct amdgpu_firmware_info *ucode) ++{ ++ struct amdgpu_device *adev = psp->adev; ++ const struct sdma_firmware_header_v1_0 *sdma_hdr = ++ (const struct sdma_firmware_header_v1_0 *) ++ adev->sdma.instance[ucode->ucode_id - AMDGPU_UCODE_ID_SDMA0].fw->data; ++ const struct gfx_firmware_header_v1_0 *ce_hdr = ++ (const struct gfx_firmware_header_v1_0 *)adev->gfx.ce_fw->data; ++ const struct gfx_firmware_header_v1_0 *pfp_hdr = ++ (const struct gfx_firmware_header_v1_0 *)adev->gfx.pfp_fw->data; ++ const struct gfx_firmware_header_v1_0 *me_hdr = ++ (const struct gfx_firmware_header_v1_0 *)adev->gfx.me_fw->data; ++ const struct gfx_firmware_header_v1_0 *mec_hdr = ++ (const struct gfx_firmware_header_v1_0 *)adev->gfx.mec_fw->data; ++ const struct rlc_firmware_header_v2_0 *rlc_hdr = ++ (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data; ++ const struct smc_firmware_header_v1_0 *smc_hdr = ++ (const struct smc_firmware_header_v1_0 *)adev->pm.fw->data; ++ ++ switch (ucode->ucode_id) { ++ case AMDGPU_UCODE_ID_SDMA0: ++ case AMDGPU_UCODE_ID_SDMA1: ++ case AMDGPU_UCODE_ID_SDMA2: ++ case AMDGPU_UCODE_ID_SDMA3: ++ case AMDGPU_UCODE_ID_SDMA4: ++ case AMDGPU_UCODE_ID_SDMA5: ++ case AMDGPU_UCODE_ID_SDMA6: ++ case AMDGPU_UCODE_ID_SDMA7: ++ amdgpu_ucode_print_sdma_hdr(&sdma_hdr->header); ++ break; ++ case AMDGPU_UCODE_ID_CP_CE: ++ amdgpu_ucode_print_gfx_hdr(&ce_hdr->header); ++ break; ++ case AMDGPU_UCODE_ID_CP_PFP: ++ amdgpu_ucode_print_gfx_hdr(&pfp_hdr->header); ++ break; ++ case AMDGPU_UCODE_ID_CP_ME: ++ amdgpu_ucode_print_gfx_hdr(&me_hdr->header); ++ break; ++ case AMDGPU_UCODE_ID_CP_MEC1: ++ amdgpu_ucode_print_gfx_hdr(&mec_hdr->header); ++ break; ++ case AMDGPU_UCODE_ID_RLC_G: ++ amdgpu_ucode_print_rlc_hdr(&rlc_hdr->header); ++ break; ++ case AMDGPU_UCODE_ID_SMC: ++ amdgpu_ucode_print_smc_hdr(&smc_hdr->header); ++ break; ++ } ++} ++ + static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode, + struct psp_gfx_cmd_resp *cmd) + { +@@ -1026,6 +1078,8 @@ static int psp_np_fw_load(struct psp_context *psp) + ucode->ucode_id == AMDGPU_UCODE_ID_CP_MEC2_JT) + continue; + ++ psp_print_fw_hdr(psp, ucode); ++ + ret = psp_execute_np_fw_load(psp, ucode); + if (ret) + return ret; +-- +2.17.1 + |