Hi Dave, Daniel, Fixes for 5.18. The following changes since commit f6d790e5a7fe42706756c7fa1686d08d230610fc: Merge tag 'drm-intel-next-fixes-2022-03-10' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2022-03-11 13:27:00 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-03-18 for you to fetch changes up to 426c89aa203bcec9d9cf6eea36735eafa1b1f099: drm/amdgpu: Use drm_mode_copy() (2022-03-15 15:01:12 -0400) ---------------------------------------------------------------- amd-drm-next-5.18-2022-03-18: amdgpu: - Aldebaran fixes - SMU 13.0.5 fixes - DCN 3.1.5 fixes - DCN 3.1.6 fixes - Pipe split fixes - More display FP cleanup - DP 2.0 UHBR fix - DC GPU reset fix - DC deep color ratio fix - SMU robustness fixes - Runtime PM fix for APUs - IGT reload fixes - SR-IOV fix - Misc fixes and cleanups amdkfd: - CRIU fixes - SVM fixes UAPI: - Properly handle SDMA transfers with CRIU Proposed user mode change: https://github.com/checkpoint-restore/criu/pull/1709 ---------------------------------------------------------------- Alex Deucher (2): drm/amdgpu/display: enable scatter/gather display for DCN 3.1.6 drm/amdgpu: only check for _PR3 on dGPUs Anthony Koo (2): drm/amd/display: [FW Promotion] Release 0.0.107.0 drm/amd/display: [FW Promotion] Release 0.0.108.0 Aric Cyr (2): drm/amd/display: 3.2.176 drm/amd/display: 3.2.177 Becle Lee (1): drm/amd/display: Wait for hubp read line for Pollock Charlene Liu (5): drm/amd/display: add debug option to bypass ssinfo from bios for dcn315 drm/amd/display: fix the clock source contruct for dcn315 drm/amd/display: merge two duplicated clock_source_create drm/amd/display: enable dcn315/316 s0i2 support drm/amd/display: Add save/restore PANEL_PWRSEQ_REF_DIV2 Chris Park (1): drm/amd/display: Add NULL check Dale Zhao (1): drm/amd/display: Add new enum for EDID status Dan Carpenter (1): drm/amd/pm: fix indenting in __smu_cmn_reg_print_error() David Yat Sin (3): drm/amdkfd: CRIU remove sync and TLB flush on restore drm/amdkfd: CRIU Refactor restore BO function drm/amdkfd: CRIU export dmabuf handles for GTT BOs Dillon Varone (1): drm/amd/display: Add minimal pipe split transition state Eric Yang (1): drm/amd/display: Block zstate when more than one plane enabled George Shen (1): drm/amd/display: Clean up fixed VS PHY test w/a function Hansen Dsouza (1): drm/amd/display: fix deep color ratio Hawking Zhang (1): drm/amdgpu: drop xmgi23 error query/reset support Jasdeep Dhillon (1): drm/amd/display: move FPU associated DCN303 code to DML folder JinZe.Xu (1): drm/amd/display: Add I2C escape to support query device exist. Jing Zhou (2): drm/amd/display: Update engine ddc drm/amd/display: Add null pointer filter Jingwen Zhu (1): drm/amd/display: add gamut coefficient set A and B Jonathan Kim (1): drm/amdgpu: fix aldebaran xgmi topology for vf Julia Lawall (3): drm/amd/pm: fix typos in comments drm/amdgpu: fix typos in comments drm/amdgpu/dc: fix typos in comments Lang Yu (1): drm/amdgpu: only allow secure submission on rings which support that Leo (Hanghong) Ma (2): drm/amd/display: Add link dp trace support drm/amd/display: Add function to get the pipe from the stream context Leo Li (1): drm/amd/display: Fix compile error from TO_CLK_MGR_INTERNAL Leung, Martin (1): drm/amd/display: cleaning up smu_if to add future flexibility Lijo Lazar (2): drm/amdgpu: Disable baco dummy mode drm/amd/pm: Send message when resp status is 0xFC Melissa Wen (3): drm/amd/display: move FPU-related code from dcn20 to dml folder drm/amd/display: move FPU operations from dcn21 to dml/dcn20 folder drm/amd/display: move FPU code from dcn10 to dml/dcn10 folder Nicholas Kazlauskas (2): drm/amd/display: Fix double free during GPU reset on DC streams drm/amd/display: Add pstate verification and recovery for DCN31 Paul Menzel (1): drm/amdgpu: Use ternary operator in `vcn_v1_0_start()` Philip Yang (2): drm/amdgpu: Move reset domain init before calling RREG32 drm/amdkfd: evict svm bo worker handle error Stanley.Yang (3): drm/amd/pm: add send bad channel info function drm/amdgpu: message smu to update bad channel info drm/amd/pm: use pm mutex to protect ecc info table Sung Joon Kim (1): drm/amd/display: disable HPD SW timer for passive dongle type 1 only Tianci Yin (1): drm/amdgpu/vcn: fix vcn ring test failure in igt reload test Tianci.Yin (2): drm/amd/display: fix dp kvm can't light up drm/amd: fix gfx hang on renoir in IGT reload test Ville Syrjälä (3): drm/amdgpu: Remove pointless on stack mode copies drm/radeon: Use drm_mode_copy() drm/amdgpu: Use drm_mode_copy() Wayne Lin (2): drm/amd/display: Fix a few parts in debugfs entry drm/amd/display: Retry when fail reading lane status during LT Wenjing Liu (1): drm/amd/display: handle DP2.0 RX with UHBR20 but not UHBR13.5 support Wyatt Wood (1): drm/amd/display: Release AUX engine after failed acquire Yifan Zhang (1): drm/amdgpu: change registers in error checking for smu 13.0.5 Yongqiang Sun (2): drm/amdgpu: Merge get_reserved_allocation to get_vbios_allocations. drm/amdgpu: Add stolen reserved memory for MI25 SRIOV. yipechai (1): drm/amdgpu: fixed the warnings reported by kernel test robot drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 41 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 25 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 22 - drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 1 - drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 1 + drivers/gpu/drm/amd/amdgpu/soc15.c | 4 + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 3 + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 315 ++-- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 29 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 21 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 50 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 10 +- .../gpu/drm/amd/display/dc/bios/command_table.c | 6 +- .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 13 +- .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 9 +- .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h | 67 +- .../dc/clk_mgr/dcn30/dcn30_smu11_driver_if.h | 74 + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 5 +- .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 24 + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.h | 2 + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 8 +- .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c | 26 + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.h | 2 + drivers/gpu/drm/amd/display/dc/core/dc.c | 22 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 9 + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 159 +- .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 7 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 14 + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 41 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 2 + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 117 ++ .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 9 + drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c | 26 + drivers/gpu/drm/amd/display/dc/dce/dce_i2c.h | 6 + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 15 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 4 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 10 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 77 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.h | 4 + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 25 - drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 10 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1369 +------------- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 31 +- drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 25 - .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 564 +----- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.h | 11 + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 2 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 1 + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 7 + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 1 + drivers/gpu/drm/amd/display/dc/dcn303/Makefile | 26 - .../drm/amd/display/dc/dcn303/dcn303_resource.c | 327 +--- .../drm/amd/display/dc/dcn303/dcn303_resource.h | 3 + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 60 + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 5 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 8 +- .../drm/amd/display/dc/dcn315/dcn315_resource.c | 37 +- .../drm/amd/display/dc/dcn316/dcn316_resource.c | 37 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 + .../gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.c | 123 ++ .../dc/dml/dcn10/dcn10_fpu.h} | 12 +- .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 1926 ++++++++++++++++++++ .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 51 + .../gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c | 362 ++++ .../dc/dml/dcn303/dcn303_fpu.h} | 14 +- drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 6 +- drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw/panel_cntl.h | 1 + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 1 + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 5 + drivers/gpu/drm/amd/display/dc/link/Makefile | 2 +- .../gpu/drm/amd/display/dc/link/link_dp_trace.c | 146 ++ .../gpu/drm/amd/display/dc/link/link_dp_trace.h | 57 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 92 +- .../drm/amd/display/include/ddc_service_types.h | 1 + .../amd/display/include/grph_object_ctrl_defs.h | 22 - drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 19 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 2 +- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 10 + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 7 + .../drm/amd/pm/swsmu/inc/pmfw_if/aldebaran_ppsmc.h | 3 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 43 + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 14 +- drivers/gpu/drm/radeon/radeon_connectors.c | 4 +- include/uapi/linux/kfd_ioctl.h | 5 +- 117 files changed, 3944 insertions(+), 2944 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_smu11_driver_if.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.c rename drivers/gpu/drm/amd/{amdgpu/amdgpu_hdp.c => display/dc/dml/dcn10/dcn10_fpu.h} (89%) create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c rename drivers/gpu/drm/amd/{amdgpu/amdgpu_mmhub.c => display/dc/dml/dcn303/dcn303_fpu.h} (78%) create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_trace.c create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_trace.h
