drm/amdgpu: add vangogh_reg_base_init function for van gogh
Subsystems (2)
PATCH 5/45 drm/amdgpu: add vangogh_reg_base_init function for van gogh
From: Huang Rui <[email protected]>
This patch adds vangogh_reg_base_init function to init the register base for van gogh.
v2: make vangogh_reg_base_init void, align equality sign
--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/nv.h | 1 + drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 + .../gpu/drm/amd/include/vangogh_ip_offset.h | 1516 +++++++++++++++++ 4 files changed, 1568 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c create mode 100644 drivers/gpu/drm/amd/include/vangogh_ip_offset.h
drivers/gpu/drm/amd/amdgpu/Makefile +1 -1
@@ -69,7 +69,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce amdgpu-y += \ vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \ vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o navi10_reg_init.o navi14_reg_init.o \ - arct_reg_init.o navi12_reg_init.o mxgpu_nv.o sienna_cichlid_reg_init.o + arct_reg_init.o navi12_reg_init.o mxgpu_nv.o sienna_cichlid_reg_init.o vangogh_reg_init.o # add DF block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/nv.h +1 -0
@@ -34,4 +34,5 @@ int navi10_reg_base_init(struct amdgpu_device *adev);int navi14_reg_base_init (struct amdgpu_device *adev);int navi12_reg_base_init (struct amdgpu_device *adev);int sienna_cichlid_reg_base_init (struct amdgpu_device *adev); +void vangogh_reg_base_init (struct amdgpu_device *adev);#endif
drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c new file +50 -0
50 lines not on this page · raw message
drivers/gpu/drm/amd/include/vangogh_ip_offset.h new file +1516 -0
1,516 lines not on this page · raw message
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/45 drm/amdgpu: add nv common ip block support for van gogh
From: Huang Rui <[email protected]>
This patch adds common ip support for van gogh.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/nv.c +8 -0
@@ -478,6 +478,9 @@ static int nv_reg_base_init(struct amdgpu_device *adev)case CHIP_NAVY_FLOUNDER :sienna_cichlid_reg_base_init (adev);break ; +case CHIP_VANGOGH : +vangogh_reg_base_init (adev); +break ;default :return -EINVAL ; }
@@ -858,6 +861,11 @@ static int nv_common_early_init(void *handle) adev->external_rev_id = adev->rev_id +0x32 ;break ; +case CHIP_VANGOGH : + adev->cg_flags =0 ; + adev->pg_flags =0 ; + adev->external_rev_id = adev->rev_id +0x01 ; +break ;default :/* FIXME: not supported yet */ return -EINVAL ;
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/45 drm/amdgpu: use gpu virtual address for interrupt packet write space for vangogh
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
The interrupts are not stable while uses guest physical address (GPA) for interrupt packet write space even on direct loading case.
v2: make condition more readable
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +5 -2
@@ -661,8 +661,11 @@ static int navi10_ih_sw_init(void *handle)/* use gpu virtual address for ih ring * until ih_checken is programmed to allow * use bus address for ih ring by psp bl */ - use_bus_addr = - (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) ? false : true; +if ((adev->flags &AMD_IS_APU ) || + (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP )) + use_bus_addr = false; +else + use_bus_addr = true; r =amdgpu_ih_ring_init (adev, &adev->irq.ih,256 *1024 , use_bus_addr);if (r)return r;
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 36/45 drm/amdgpu: add TOC firmware support for apu (v3)
In reply to Alex DeucherFrom: Huang Rui <[email protected]>
APU needs load toc firmware for gfx10 series on psp front door loading.
v2: rebase against latest code
v3: clarify error message
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 36 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 7 +++++ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 33 ++++++++++++++++------- 4 files changed, 77 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +11 -0
@@ -325,6 +325,10 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info, fw_info->ver = adev->dm.dmcub_fw_version; fw_info->feature =0 ;break ; +case AMDGPU_INFO_FW_TOC : + fw_info->ver = adev->psp.toc_fw_version; + fw_info->feature = adev->psp.toc_feature_version; +break ;default :return -EINVAL ; }
@@ -1464,6 +1468,13 @@ static int amdgpu_debugfs_firmware_info(struct seq_file *m, void *data)seq_printf (m,"DMCUB feature version: %u, firmware version: 0x%08x\n" , fw_info.feature, fw_info.ver); +/* TOC */ + query_fw.fw_type =AMDGPU_INFO_FW_TOC ; + ret =amdgpu_firmware_info (&fw_info, &query_fw, adev); +if (ret) +return ret; +seq_printf (m,"TOC feature version: %u, firmware version: 0x%08x\n" , + fw_info.feature, fw_info.ver);seq_printf (m,"VBIOS version: %s\n" , ctx->vbios_version);
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +36 -0
@@ -2415,6 +2415,42 @@ int psp_init_asd_microcode(struct psp_context *psp,return err; } +int psp_init_toc_microcode (struct psp_context *psp, +const char *chip_name) +{ +struct amdgpu_device *adev = psp->adev; +char fw_name[30 ]; +const struct psp_firmware_header_v1_0 *toc_hdr; +int err =0 ; + +if (!chip_name) { +dev_err (adev->dev,"invalid chip name for toc microcode\n" ); +return -EINVAL ; + } + +snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_toc.bin" , chip_name); + err =request_firmware (&adev->psp.toc_fw, fw_name, adev->dev); +if (err) + goto out; + + err =amdgpu_ucode_validate (adev->psp.toc_fw); +if (err) + goto out; + + toc_hdr = (const struct psp_firmware_header_v1_0 *)adev->psp.toc_fw->data; + adev->psp.toc_fw_version =le32_to_cpu (toc_hdr->header.ucode_version); + adev->psp.toc_feature_version =le32_to_cpu (toc_hdr->ucode_feature_version); + adev->psp.toc_bin_size =le32_to_cpu (toc_hdr->header.ucode_size_bytes); + adev->psp.toc_start_addr = (uint8_t *)toc_hdr + +le32_to_cpu (toc_hdr->header.ucode_array_offset_bytes); +return 0 ; +out: +dev_err (adev->dev,"fail to request/validate toc microcode\n" ); +release_firmware (adev->psp.toc_fw); + adev->psp.toc_fw =NULL ; +return err; +} +int psp_init_sos_microcode (struct psp_context *psp,const char *chip_name) {
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +7 -0
@@ -253,6 +253,11 @@ struct psp_contextuint32_t asd_ucode_size;uint8_t *asd_start_addr; +/* toc firmware */ +const struct firmware *toc_fw; +uint32_t toc_fw_version; +uint32_t toc_feature_version; +/* fence buffer */ struct amdgpu_bo *fence_buf_bo;uint64_t fence_buf_mc_addr;
@@ -386,6 +391,8 @@ int psp_ring_cmd_submit(struct psp_context *psp, int index);int psp_init_asd_microcode (struct psp_context *psp,const char *chip_name); +int psp_init_toc_microcode (struct psp_context *psp, +const char *chip_name);int psp_init_sos_microcode (struct psp_context *psp,const char *chip_name); int psp_init_ta_microcode(struct psp_context *psp,
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +23 -10
@@ -109,20 +109,16 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)BUG (); } - err =psp_init_sos_microcode (psp, chip_name); -if (err) -return err; - -if (adev->asic_type !=CHIP_SIENNA_CICHLID && - adev->asic_type !=CHIP_NAVY_FLOUNDER ) { - err =psp_init_asd_microcode (psp, chip_name); -if (err) -return err; - }switch (adev->asic_type) {case CHIP_VEGA20 :case CHIP_ARCTURUS : + err =psp_init_sos_microcode (psp, chip_name); +if (err) +return err; + err =psp_init_asd_microcode (psp, chip_name); +if (err) +return err;snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_ta.bin" , chip_name); err =request_firmware (&adev->psp.ta_fw, fw_name, adev->dev);if (err) {
@@ -150,6 +146,12 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)case CHIP_NAVI10 :case CHIP_NAVI14 :case CHIP_NAVI12 : + err =psp_init_sos_microcode (psp, chip_name); +if (err) +return err; + err =psp_init_asd_microcode (psp, chip_name); +if (err) +return err;if (amdgpu_sriov_vf (adev))break ;snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_ta.bin" , chip_name);
@@ -180,10 +182,21 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)break ;case CHIP_SIENNA_CICHLID :case CHIP_NAVY_FLOUNDER : + err =psp_init_sos_microcode (psp, chip_name); +if (err) +return err; err =psp_init_ta_microcode (&adev->psp, chip_name);if (err)return err;break ; +case CHIP_VANGOGH : + err =psp_init_asd_microcode (psp, chip_name); +if (err) +return err; + err =psp_init_toc_microcode (psp, chip_name); +if (err) +return err; +break ;default :BUG (); }
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx