This patch set adds support for the Aldebaran GPU. This includes support for all of the IP blocks on the ASIC. I'm not sending out the register header updates due to their size, but you can view the full patch set here: https://gitlab.freedesktop.org/agd5f/linux/-/commits/amd-staging-drm-next-aldebaran Alex Alex Deucher (1): drm/amdgpu: add mmhub client ids for aldebaran Alex Sierra (4): drm/amdgpu: UTLC1 RB SDMA timeout on Aldebaran drm/amdgpu: enable 48-bit IH timestamp counter drm/amdgpu: update mmhub client ids for Aldebaran drm/amdgpu: use pd addr based on gart level page table Amber Lin (1): drm/amdgpu: Aldebaran doesn't use semaphore Dennis Li (4): drm/amdgpu: enable sram initialization for aldebaran drm/amdgpu: add ras support for gfx of aldebaran drm/amdgpu: refine ras codes for GC utc of aldebaran drm/amdgpu: enable watchdog feature for SQ of aldebaran Eric Huang (4): drm/amdgpu: new cache coherence change for Aldebaran drm/amdkfd: add new flag for uncached GPU mapping drm/amdgpu: set CPU mapping of vram as cached for A+A mode (v2) drm/amdgpu: set snoop bit in pde/pte entries for Aldebaran A+A Feifei Xu (7): drm/amdgpu: Add DID for aldebaran drm/amdgpu:add smu mode1/2 support for aldebaran drm/amdgpu:return true for mode1_reset_support on aldebaran drm/amdgpu: correct vram_info for HBM2E drm/amd/pm:add aldebaran support for getting bootup values drm/amdgpu: update atom_firmware_info_v3_4 (v2) drm/amdpgu: add ATOM_DGPU_VRAM_TYPE_HBM2E vram type Felix Kuehling (1): drm/amdgpu: Let KFD use more VMIDs on Aldebaran Harish Kasiviswanathan (2): drm/amdgpu: Add support for cached VRAM in A+A drm/amdgpu: Don't change CPU mapping of on-chip memory pools Hawking Zhang (51): drm/amdgpu: add gc v9_4_2 ip headers (v3) drm/amdgpu: add mmhub v1_7 ip headers (v3) drm/amdgpu: add mp v13_0_2 ip headers (v3) drm/amdgpu: add smuio v13_0_2 ip headers (v3) drm/amdgpu: add sdma v4_4_0 ip headers (v2) drm/amdgpu: add thm v13_0_2 ip headers (v3) drm/amdgpu: add umc v6_7_0 ip headers (v3) drm/amdgpu: add vcn v2_6_0 ip headers (v3) drm/amd/include: add ip offset header for aldebaran (v5) drm/amdgpu: init sos microcode for psp v13 drm/amdgpu: add kdb loading support for psp v13 drm/amdgpu: add sys_drv loading support for psp v13 drm/amdgpu: add tOS loading support for psp v13 drm/amdgpu: add psp v13 ring support drm/amdgpu: init psp v13 ip function drm/amdgpu: fix incorrect EP_STRAP reg offset for aldebaran drm/amdgpu: load pmfw prior to other non-psp fw for aldebaran drm/amdgpu: detect sriov capability for aldebaran drm/amdgpu: bypass gc_9_x_common golden settings drm/amdgpu: enable psp v13 ip block for aldebaran drm/amdgpu: add new smuio callbacks for aldebaran drm/amdgpu: implement smuio v13_0 callbacks drm/amdgpu: initialize smuio callbacks for aldebaran drm/amdgpu: skip MEC2_JT initialization for aldebaran drm/amdgpu: initialize ta firmware for aldebaran drm/amdgpu: comments out vcn/jpeg ip blocks for aldebaran drm/amdgpu: initialize external rev_id for aldebaran drm/amdgpu: declare smuio v13_0 callbacks as static drm/amdgpu: support get_vram_info atomfirmware i/f for aldebaran drm/amdgpu: init gds for aldebaran drm/amdgpu: skip gds ras workaround for aldebaran drm/amdgpu: use physical_node_id to calculate aper_base drm/amdgpu: apply sdma golden settings for aldebaran drm/amdgpu: add sdma v4_4 ras function drm/amdgpu: add sdma ras error query callback for aldebaran drm/amdgpu: add sdma ras error reset callback for aldebaran drm/amdgpu: add mmhub ras error query callback for aldebaran drm/amdgpu: add mmhub ras error reset callback for aldebaran drm/amdgpu: add mmhub error status query callback for aldebaran drm/amdgpu: correct IH_CHICKEN programming for aldebaran drm/amdgpu: switch to vega20 ih block for aldebaran drm/amdgpu: disallow use semaphore on aldebaran drm/amdgpu: query aldebaran gfx_config through atomfirmware i/f drm/amdgpu: retire aldebaran gpu_info firmware drm/amdgpu: bypass hdp read cache invalidation for aldebaran (v2) drm/amdgpu: switch to cached noretry setting for aldebaran drm/amdgpu: apply new pmfw loading sequence to arcturus and onwards drm/amdgpu: allow use psp to load firmware (v2) drm/amdgpu: apply gc v9_4_2 golden settings for aldebaran drm/amdgpu: add common gc golden settings for aldebaran drm/amdgpu: update TCP_CHAN_STEER_1 golden value for aldebaran James Zhu (9): drm/amdgpu: add Aldebaran to the VCN family drm/amdgpu/vcn2.6: Add vcn2.6 support drm/amdgpu/jpeg2.6: Add jpeg2.6 support drm/amdgpu/nbio: add aldebaran support drm/amdgpu/vcn: enable VCN on aldebaran drm/amdgpu/jpeg: enable JPEG on aldebaran drm/amdgpu: enable vcn and jpeg on aldebaran drm/amdgpu: enable vcn dpg mode on aldebaran drm/amdgpu: enable dpg indirect sram mode on aldebaran Jay Cornwall (1): drm/amdkfd: Add aldebaran trap handler support John Clements (3): drm/amdgpu: updated host to psp mailbox cmd (v2) drm/amdgpu: added register list driver ctx (v2) drm/amdgpu: added support for register list loading (v2) Jonathan Kim (3): drm/amdgpu: mask the xgmi number of hops reported from psp to kfd drm/amdkfd: add aldebaran kfd2kgd callbacks to kfd device (v2) drm/amdgpu: restore aldebaran save ttmp and trap config on init (v2) Kenneth Feng (1): drm/amd/pm: add new data in metrics table Kevin Wang (10): drm/amdgpu: add aldebaran sdma firmware support (v2) drm/amdgpu: switch to use reg distance member for mmhub v1_7 drm/amd/swsmu: add aldebaran smu driver if header (v2) drm/amd/swsmu: add aldebaran smu13 ip support (v3) drm/amdgpu: declare sdma firmware binary file for aldebaran drm/amd/pm: remove aldebaran serial number support drm/amdgpu: add gc powerbrake support (v2) drm/amd/pm: add aldebaran serial number support drm/amdgpu: change psp_rap_invoke() function return value drm/amdgpu: add psp RAP L0 check support Laurent Morichetti (1): drm/amdkfd: Fix saving the ACC vgprs for Aldebaran Le Ma (11): drm/amdgpu: add aldebaran asic type drm/amdgpu: add register base init for aldebaran (v2) drm/amdgpu: add gpu_info fw parse support for aldebaran drm/amdgpu: add soc15 common ip block support for aldebaran drm/amdgpu: add mmhub support for aldebaran (v3) drm/amdgpu: add gmc v9 block support for Aldebaran drm/amdgpu: set fw load type for aldebaran drm/amdgpu: add gfx v9 block support for aldebaran drm/amdgpu: add sdma block support for aldebaran drm/amdgpu: correct mmBIF_SDMA4_DOORBELL_RANGE address for aldebaran drm/amdgpu: set ip blocks for aldebaran Lijo Lazar (17): drm/amd/pm: Add atom_smc_dpm_info_v4_10 for aldebaran drm/amd/amdgpu: Add smu_pptable module parameter drm/amd/pm: Add support to override pptable id for aldebaran drm/amd/pm: Remove CPU virtual address notification in aldebaran drm/amd/pm: Set no fan control flag as needed. drm/amdgpu: Enable swsmu block on aldebaran drm/amdgpu: Add clock gating support for aldebaran drm/amdgpu/pm: Remove unsupported MP1 messages from aldebaran drm/amdgpu/pm: Fix reset message mapping on aldebaran drm/amdgpu/pm: Remove redundant generic message index drm/amdgpu: Enable CP idle interrupts drm/amdgpu: Fix aldebaran MMHUB CG/LS logic drm/amd/pm: Fix power limit query on aldebaran drm/amd/pm: Add DCBTC support for aldebaran drm/amd/pm: Enable performance determinism on aldebaran drm/amd/pm: Correct msg status check for powerlimit drm/amd/pm: Enable user min/max gfxclk on aldebaran Oak Zeng (20): drm/amdgpu: Fix IH client ID naming table drm/amdgpu: Clean up mmhub functions for aldebaran drm/amdgpu: pre-map device buffer as cached for A+A config drm/ttm: ioremap buffer properly according to TTM placement flag drm/amdgpu: Don't do FB resize under A+A config drm/amdgpu: Use free system memory size for kfd memory accounting drm/amdgpu: Don't reserve vram as WC for A+A drm/amdgpu: Use physical translation mode to access page table drm/amdgpu: Moved gart_size calculation to mc_init functions drm/amdgpu: Modify comments of vram_start/end drm/amdgpu: Placement of gart and vram in sysvm aperture drm/amdgpu: Use different gart table parameters for 2-level gart table drm/amdgpu: Add function to allocate and fill PDB0 drm/amdgpu: Set up vmid0 PDB0 drm/amdgpu: HW setup of 2-level vmid0 page table drm/amdgpu: workaround the TMR MC address issue amdgpu: Fix GART page table s-bit drm/amdgpu: Fix the comment in amdgpu_gmc.h drm/amdkfd: Add kernel parameter to stop queue eviction on vm fault drm/amdkfd: Check HIQ's MQD for queue preemption status Philip Yang (1): drm/amdgpu: enable retry fault wptr overflow Rajneesh Bhardwaj (4): drm/amdgpu: enable xgmi support for Aldebaran drm/amdgpu: define address map for host xgmi link (v3) drm/amdgpu: support get xgmi information for Aldebaran drm/amdkfd: expose host gpu link via sysfs (v2) Yong Zhao (3): drm/amdkfd: Add Aldebaran KFD support drm/amdgpu: Print the IH client ID name when vm fault happens drm/amdgpu: Fix an omission when adding Aldebaran support drivers/gpu/drm/amd/amdgpu/Makefile | 14 +- .../gpu/drm/amd/amdgpu/aldebaran_reg_init.c | 54 + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- .../drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 47 + .../drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 16 +- .../drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h | 30 + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 31 +- .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 41 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 42 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 40 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 139 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 30 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 35 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 29 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 94 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 9 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 88 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 1237 + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 41 + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 66 +- drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 58 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 151 +- drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 3 + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 65 +- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.h | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 1329 + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h | 28 + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 48 +- drivers/gpu/drm/amd/amdgpu/nv.c | 40 +- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 378 + drivers/gpu/drm/amd/amdgpu/psp_v13_0.h | 30 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 46 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 232 + drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h | 28 + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 121 + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.h | 30 + drivers/gpu/drm/amd/amdgpu/soc15.c | 128 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 12 + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 48 + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 99 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.h | 1 + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 32 +- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 49 +- .../gpu/drm/amd/amdkfd/cik_event_interrupt.c | 5 +- .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 492 + .../drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 1 + .../drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 204 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 17 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 25 + .../drm/amd/amdkfd/kfd_device_queue_manager.c | 18 + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 + .../gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 1 + .../gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 8 + .../gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 8 + .../gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 8 + .../gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 8 + .../gpu/drm/amd/amdkfd/kfd_packet_manager.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + .../gpu/drm/amd/include/aldebaran_ip_offset.h | 1738 + .../amd/include/asic_reg/gc/gc_9_4_2_offset.h | 7683 ++++ .../include/asic_reg/gc/gc_9_4_2_sh_mask.h | 32949 ++++++++++++++++ .../include/asic_reg/mmhub/mmhub_1_7_offset.h | 5125 +++ .../asic_reg/mmhub/mmhub_1_7_sh_mask.h | 32178 +++++++++++++++ .../include/asic_reg/mp/mp_13_0_2_offset.h | 361 + .../include/asic_reg/mp/mp_13_0_2_sh_mask.h | 531 + .../include/asic_reg/sdma/sdma_4_4_0_offset.h | 5224 +++ .../asic_reg/sdma/sdma_4_4_0_sh_mask.h | 13922 +++++++ .../asic_reg/smuio/smuio_13_0_2_offset.h | 516 + .../asic_reg/smuio/smuio_13_0_2_sh_mask.h | 1163 + .../include/asic_reg/thm/thm_13_0_2_offset.h | 346 + .../include/asic_reg/thm/thm_13_0_2_sh_mask.h | 1297 + .../include/asic_reg/umc/umc_6_7_0_offset.h | 2620 ++ .../include/asic_reg/umc/umc_6_7_0_sh_mask.h | 10796 +++++ .../include/asic_reg/vcn/vcn_2_6_0_offset.h | 1462 + .../include/asic_reg/vcn/vcn_2_6_0_sh_mask.h | 4535 +++ drivers/gpu/drm/amd/include/atomfirmware.h | 116 +- .../gpu/drm/amd/include/kgd_pp_interface.h | 12 + .../gpu/drm/amd/include/soc15_ih_clientid.h | 9 +- drivers/gpu/drm/amd/include/vi_structs.h | 32 +- drivers/gpu/drm/amd/pm/Makefile | 1 + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 88 + drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h | 126 + drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 6 + .../amd/pm/inc/smu13_driver_if_aldebaran.h | 512 + drivers/gpu/drm/amd/pm/inc/smu_types.h | 27 +- drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 276 + .../gpu/drm/amd/pm/inc/smu_v13_0_pptable.h | 165 + drivers/gpu/drm/amd/pm/swsmu/Makefile | 2 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 42 +- drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 30 + .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1447 + .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.h | 72 + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1834 + drivers/gpu/drm/ttm/ttm_bo_util.c | 4 + include/drm/amd_asic_type.h | 15 +- include/uapi/linux/kfd_ioctl.h | 1 + 115 files changed, 132817 insertions(+), 379 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/aldebaran_reg_init.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.h create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.h create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v13_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v13_0.h create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4.h create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v13_0.h create mode 100644 drivers/gpu/drm/amd/include/aldebaran_ip_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_7_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_13_0_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_13_0_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_7_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_2_6_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0.h create mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.h create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c -- 2.29.2 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
