Hi Dave, Sima, More new stuff for 6.9. The following changes since commit d5597444032b2f5c8624918fb5b29be5bba78a3c: drm/amdgpu: Fix HDP flush for VFs on nbio v7.9 (2024-02-07 12:26:24 -0500) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-6.9-2024-02-19 for you to fetch changes up to 31e0a586f3385134bcad00d8194eb0728cb1a17d: drm/amdgpu: add MMHUB 3.3.1 support (2024-02-19 14:50:46 -0500) ---------------------------------------------------------------- amd-drm-next-6.9-2024-02-19: amdgpu: - ATHUB 4.1 support - EEPROM support updates - RAS updates - LSDMA 7.0 support - JPEG DPG support - IH 7.0 support - HDP 7.0 support - VCN 5.0 support - Misc display fixes - Retimer fixes - DCN 3.5 fixes - VCN 4.x fixes - PSR fixes - PSP 14.0 support - VA_RESERVED cleanup - SMU 13.0.6 updates - NBIO 7.11 updates - SDMA 6.1 updates - MMHUB 3.3 updates - Suspend/resume fixes - DMUB updates amdkfd: - Trap handler enhancements - Fix cache size reporting - Relocate the trap handler radeon: - fix typo in print statement ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu/psp: update define to better align with its meaning Aric Cyr (1): drm/amd/display: 3.2.272 Charlene Liu (2): drm/amd/display: enable fgcg by default drm/amd/display: allow psr-su/replay for z8 Dan Carpenter (1): drm/amd/display: Fix && vs || typos Felix Kuehling (2): drm/amdgpu: Reduce VA_RESERVED_BOTTOM to 64KB drm/amdkfd: Relocate TBA/TMA to opposite side of VM hole Gabe Teeger (1): Revert "drm/amd/display: Send DTBCLK disable message on first commit" George Shen (1): Revert "drm/amd/display: Add left edge pixel for YCbCr422/420 + ODM pipe split" Hamza Mahfooz (2): drm/amdgpu: make damage clips support configurable drm/amdgpu: respect the abmlevel module parameter value if it is set Hawking Zhang (8): drm/amdgpu: Add athub v4_1_0 ip headers (v5) drm/amdgpu: Add athub v4_1_0 ip block support drm/amdgpu: Add lsdma v7_0_0 ip headers (v3) drm/amdgpu: Add osssys v7_0_0 ip headers (v4) drm/amdgpu: Add hdp v7_0_0 ip headers (v3) drm/amdgpu: Add vcn v5_0_0 ip headers (v5) drm/amdgpu: Add mp v14_0_2 ip headers (v5) drm/amdgpu: Add psp v14_0 ip block support Jonathan Kim (1): drm/amdkfd: fill in data for control stack header for gfx10 Kent Russell (1): drm/amdkfd: Fix L2 cache size reporting in GFX9.4.3 Laurent Morichetti (1): drm/amdkfd: pass debug exceptions to second-level trap handler Lijo Lazar (1): drm/amd/pm: Allow setting max UCLK on SMU v13.0.6 Likun Gao (16): drm/amd/swsmu: add judgement for vcn jpeg dpm set drm/amdgpu: skip ucode bo reserve for RLC AUTOLOAD drm/amdgpu: support rlc auotload type set drm/amdgpu: Add lsdma v7_0 ip block support drm/amdgpu/discovery: Add lsdma v7_0 ip block drm/amdgpu: Add ih v7_0 ip block support drm/amdgpu/discovery: Add ih v7_0 ip block drm/amdgpu: Add hdp v7_0 ip block support drm/amdgpu/discovery: Add hdp v7_0 ip block drm/amdgpu: use spirom update wait_for helper for psp v14 drm/amdgpu: support psp ip block for psp v14 drm/amdgpu/psp: set autoload support by default drm/amdgpu/psp: handle TMR type via flag drm/amdgpu/psp: set boot_time_tmr flag drm/amdgpu: add psp_timeout to limit PSP related operation drm/amdgpu: support psp ip block discovery for psp v14 Mario Limonciello (3): drm/amd: Stop evicting resources on APUs in suspend Revert "drm/amd: flush any delayed gfxoff on suspend entry" drm/amd: Change `jpeg_v4_0_5_start_dpg_mode()` to void Martin Tsai (1): drm/amd/display: should support dmub hw lock on Replay Michael Strauss (1): drm/amd/display: Update FIXED_VS Retimer HWSS Test Pattern Sequences Nicholas Kazlauskas (2): drm/amd/display: Add shared firmware state for DMUB IPS handshake drm/amd/display: Increase ips2_eval delay for DCN35 Nikita Zhandarovich (2): drm/radeon/ni: Fix wrong firmware size logging in ni_init_microcode() drm/amd/display: fix NULL checks for adev->dm.dc in amdgpu_dm_fini() Rajneesh Bhardwaj (2): drm/amdkfd: update SIMD distribution algo for GFXIP 9.4.2 onwards drm/amdgpu: Fix implicit assumtion in gfx11 debug flags Rodrigo Siqueira (1): drm/amd/display: Remove break after return Roman Li (1): drm/amd/display: Fix array-index-out-of-bounds in dcn35_clkmgr Saleemkhan Jamadar (2): drm/amdgpu: add ucode id for jpeg DPG support drm/amdgpu/jpeg: add support for jpeg DPG mode Sohaib Nadeem (2): Revert "drm/amd/display: increased min_dcfclk_mhz and min_fclk_mhz" drm/amd/display: fixed integer types and null check locations Sonny Jiang (7): drm/amdgpu: add VCN_5_0_0 firmware support drm/amdgpu: add VCN_5_0_0 IP block support amdgpu/drm: Add vcn_v5_0_0_ip_block support drm/amdgpu: Add JPEG5 support drm/amdgpu/jpeg5: add power gating support drm/amdgpu/jpeg5: Enable doorbell drm/amdgpu: Add jpeg_v5_0_0 ip block support Srinivasan Shanmugam (7): drm/amd/display: Initialize 'wait_time_microsec' variable in link_dp_training_dpia.c drm/amd/display: Fix possible use of uninitialized 'max_chunks_fbc_mode' in 'calculate_bandwidth()' drm/amd/display: Fix possible buffer overflow in 'find_dcfclk_for_voltage()' drm/amd/display: Fix possible NULL dereference on device remove/driver unload drm/amdgpu/display: Initialize gamma correction mode variable in dcn30_get_gamcor_current() drm/amdgpu: Fix missing parameter descriptions in ih_v7_0.c drm/amd/display: Add 'replay' NULL check in 'edp_set_replay_allow_active()' Thong (1): drm/amdgpu/soc21: update VCN 4 max HEVC encoding resolution Tom Chung (1): drm/amd/display: Preserve original aspect ratio in create stream Wenjing Liu (1): drm/amd/display: treat plane clip size change as MED update type Yang Wang (2): drm/amdgpu: implement smu send rma reason for smu v13.0.6 drm/amdgpu: send smu rma reason event in ras eeprom driver Yifan Zhang (8): drm/amdgpu/nbio: Add NBIO 7.11.1 Support drm/amdgpu: add nbio 7.11.1 discovery support drm/amdgpu: add smuio 14.0.1 support drm/amdgpu: add PSP 14.0.1 support drm/amdgpu: add psp 14.0.1 discovery support drm/amdgpu: add sdma 6.1.1 firmware drm/amdgpu: add SDMA 6.1.1 discovery support drm/amdgpu: add MMHUB 3.3.1 support Zhikai Zhai (1): drm/amd/display: Add align done check drivers/gpu/drm/amd/amdgpu/Makefile | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 15 + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 27 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 46 + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 36 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 67 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 42 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 15 +- drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.c | 122 + drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.h | 30 + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c | 142 + drivers/gpu/drm/amd/amdgpu/hdp_v7_0.h | 31 + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 767 ++ drivers/gpu/drm/amd/amdgpu/ih_v7_0.h | 28 + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 16 +- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.h | 15 + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 310 +- drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 570 ++ drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.h | 29 + drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.c | 121 + drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.h | 31 + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 1 + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 9 +- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 672 ++ drivers/gpu/drm/amd/amdgpu/psp_v14_0.h | 32 + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1 + drivers/gpu/drm/amd/amdgpu/soc21.c | 6 +- drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 1339 ++++ drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.h | 37 + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 2 +- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 17 +- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 29 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 25 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 9 + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 48 +- drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c | 2 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 16 +- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 1 - .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 2 + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 16 +- .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 12 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 37 - drivers/gpu/drm/amd/display/dc/dc.h | 15 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 83 +- .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 4 + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 5 +- .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 2 +- .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 8 +- .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 9 +- .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 4 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 - drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 - .../amd/display/dc/link/accessories/link_dp_cts.c | 27 +- .../link/hwss/link_hwss_dio_fixed_vs_pe_retimer.c | 16 +- .../hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.c | 51 +- .../gpu/drm/amd/display/dc/link/link_validation.c | 2 +- .../amd/display/dc/link/protocols/link_dp_phy.c | 6 +- .../display/dc/link/protocols/link_dp_training.c | 5 +- .../dc/link/protocols/link_dp_training_dpia.c | 2 +- .../dc/link/protocols/link_edp_panel_control.c | 3 +- .../amd/display/dc/resource/dcn35/dcn35_resource.c | 5 +- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 6 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 115 + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 3 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 3 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 3 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h | 3 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 3 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 3 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 3 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 3 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 12 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h | 8 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 13 +- .../drm/amd/display/include/link_service_types.h | 9 + drivers/gpu/drm/amd/include/amd_shared.h | 1 + .../include/asic_reg/athub/athub_4_1_0_offset.h | 287 + .../include/asic_reg/athub/athub_4_1_0_sh_mask.h | 1348 ++++ .../amd/include/asic_reg/hdp/hdp_7_0_0_offset.h | 219 + .../amd/include/asic_reg/hdp/hdp_7_0_0_sh_mask.h | 735 ++ .../include/asic_reg/lsdma/lsdma_7_0_0_offset.h | 388 + .../include/asic_reg/lsdma/lsdma_7_0_0_sh_mask.h | 1411 ++++ .../drm/amd/include/asic_reg/mp/mp_14_0_2_offset.h | 468 ++ .../amd/include/asic_reg/mp/mp_14_0_2_sh_mask.h | 692 ++ .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h | 2 + .../amd/include/asic_reg/oss/osssys_7_0_0_offset.h | 279 + .../include/asic_reg/oss/osssys_7_0_0_sh_mask.h | 1029 +++ .../amd/include/asic_reg/vcn/vcn_5_0_0_offset.h | 1672 +++++ .../amd/include/asic_reg/vcn/vcn_5_0_0_sh_mask.h | 7627 ++++++++++++++++++++ drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 15 + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 40 +- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 6 + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 3 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 142 +- drivers/gpu/drm/radeon/ni.c | 2 +- 117 files changed, 21302 insertions(+), 413 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/athub_v4_1_0.h create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v7_0.h create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v7_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v7_0.h create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.h create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v7_0.h create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v14_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v14_0.h create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_4_1_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_4_1_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_7_0_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_7_0_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_7_0_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_7_0_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_0_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_0_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_5_0_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_5_0_0_sh_mask.h