Hi Dave, Daniel, More new stuff for 5.18. The following changes since commit b9c7babe2c2e37a50aa42401b38d597ea78f506e: Backmerge tag 'v5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next (2022-02-14 10:52:27 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-02-18 for you to fetch changes up to b63c54d978236dd6014cf2ffba96d626e97c915c: drm/amdkfd: Use proper enum in pm_unmap_queues_v9() (2022-02-17 15:59:06 -0500) ---------------------------------------------------------------- amd-drm-next-5.18-2022-02-18: amdgpu: - kerneldoc fixes - Expose IP discovery data via sysfs - RAS rework - SRIOV fixes - Display FP fix - RDNA2 SMU fixes - Display DSC fixes - Cyan Skillfish update - GC 10.3.7 updates - SDMA 5.2.7 updates - DCN 3.1.6 updates - Fix ASPM handling - GC 10.3.6 updates amdkfd: - SPDX header cleanups - SDMA queue handling fixes - Misc fixes radeon: - iMac backlight fix ---------------------------------------------------------------- Alex Deucher (3): drm/amdgpu/sdma5.2: Adjust the name string for firmware drm/amdgpu: make cyan skillfish support code more consistent drm/amdgpu/smu11.5: restore cclks in vangogh_set_performance_level Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.104.0 Aric Cyr (1): drm/amd/display: 3.2.173 Bas Nieuwenhuizen (1): drm/amd/display: Protect update_bw_bounding_box FPU code. Changcheng Deng (1): drm/amdkfd: Replace zero-length array with flexible-array member Charlene Liu (1): drm/amd/display: make sure pipe power gating reach requested hw state Eric Yang (1): drm/amd/display: enable z9 denial interface by default Evan Quan (5): drm/amd/pm: correct the default DriverSmuConfig table settings drm/amd/pm: fulfill Navi1x implementations for DriverSmuConfig setting drm/amd/pm: fulfill Sienna_Cichlid implementations for DriverSmuConfig setting drm/amdgpu: disable MMHUB PG for Picasso drm/amd/pm: fix some OEM SKU specific stability issues Felix Kuehling (1): drm/amdkfd: Replace zero-length array with flexible-array member Guchun Chen (1): drm/amdgpu: no rlcg legacy read in SRIOV case Hansen Dsouza (1): drm/amd/display: Add DCN316 resource and SMU clock manager Hersen Wu (2): drm/amd/display: dsc mst re-compute pbn for changes on hub drm/amd/display: add dsc mst stream pbn log for debug Jonathan Kim (2): drm/amdkfd: remove unneeded unmap single queue option drm/amdkfd: navi2x requires extended engines to map and unmap sdma queues Leo Li (3): drm/amd/include: Add register headers for DCN 3.1.6 drm/amd/include: Add MP 13.0.8 register headers drm/amd/display: Add DMUB support for DCN316 Luben Tuikov (4): drm/amdgpu: Show IP discovery in sysfs drm/amdgpu: Add "harvest" to IP discovery sysfs drm/amdgpu: Fix ARM compilation warning drm/amdgpu: Dynamically initialize IP instance attributes Mario Limonciello (4): drm/amd: smu7: downgrade voltage error to info drm/amd: Check if ASPM is enabled from PCIe subsystem drm/amd: Refactor `amdgpu_aspm` to be evaluated per device drm/amd: Use amdgpu_device_should_use_aspm on navi umd pstate switching Meenakshikumar Somasundaram (1): drm/amd/display: Fix for dmub outbox notification enable Michel Dänzer (1): drm/amd/display: For vblank_disable_immediate, check PSR is really used Nathan Chancellor (1): drm/amdkfd: Use proper enum in pm_unmap_queues_v9() Nicholas Bishop (1): drm/radeon: Fix backlight control on iMac 12,1 Prike Liang (11): drm/amdgpu/discovery: add nbio sw func for 7.5.1 nbio drm/amdgpu/discovery: Add 13.0.9 SMUIO block drm/amdgpu/discovery: set sw common init for GC 10.3.7 drm/amdgpu: set new revision id for 10.3.7 GC drm/amdgpu/gmc10: add support for GC 10.3.7 drm/amdgpu/psp: Add support for MP0 13.0.8 drm/amd/pm: Add support for MP1 13.0.8 drm/amdgpu/sdma5.2: add support for SDMA 5.2.7 drm/amdgpu/gfx10: Add GC 10.3.7 Support drm/amd/display: configure dc hw resource for DCN 3.1.6 drm/amdgpu/discovery: Add sw DM function for 3.1.6 DCE Rajneesh Bhardwaj (4): drm/amdgpu: Fix some kerneldoc warnings drm/amdkfd: update SPDX license header drm/amdkfd: Fix leftover errors and warnings drm/amdgpu: Fix a kerneldoc warning Roman Li (2): drm/amd/display: Add affected crtcs to atomic state for dsc mst unplug drm/amd/display: Add dsc pre-validation in atomic check Sathishkumar S (1): drm/amdgpu: update vcn/jpeg PG flags for VCN 3.1.1 Stanley.Yang (1): drm/amdgpu: print more error info Sung Joon Kim (1): drm/amd/display: reset lane settings after each PHY repeater LT Surbhi Kakarya (1): drm/amdgpu: Handle the GPU recovery failure in SRIOV environment. Tao Zhou (1): drm/amdkfd: add return value check for queue eviction Tom Rix (2): drm/amdgpu: check return status before using stable_pstate drm/amdgpu: fix amdgpu_ras_block_late_init error handler Tom St Denis (1): drm/amd/amdgpu: Add APU flag to gca_config debugfs data (v3) Victor Skvortsov (1): drm/amdgpu: Fix wait for RLCG command completion Yifan Zhang (5): drm/amd/pm: correct the sequence of sending gpu reset msg drm/amdgpu: add nv common init for gc 10.3.6 drm/amdgpu: add Clock and Power Gating support for gc 10.3.6 drm/amdgpu: add support for gmc10 for gc 10.3.6 drm/amdgpu: add gc 10.3.6 support Yiqing Yao (1): drm/amd/pm: enable pm sysfs write for one VF mode yipechai (18): drm/amdgpu: Optimize xxx_ras_late_init/xxx_ras_late_fini for each ras block drm/amdgpu: Optimize amdgpu_gfx_ras_late_init/amdgpu_gfx_ras_fini function code drm/amdgpu: Optimize amdgpu_hdp_ras_late_init/amdgpu_hdp_ras_fini function code drm/amdgpu: Optimize amdgpu_mca_ras_late_init/amdgpu_mca_ras_fini function code drm/amdgpu: Optimize amdgpu_mmhub_ras_late_init/amdgpu_mmhub_ras_fini function code drm/amdgpu: Optimize amdgpu_nbio_ras_late_init/amdgpu_nbio_ras_fini function code drm/amdgpu: Optimize amdgpu_sdma_ras_late_init/amdgpu_sdma_ras_fini function code drm/amdgpu: Optimize amdgpu_umc_ras_late_init/amdgpu_umc_ras_fini function code drm/amdgpu: Optimize amdgpu_xgmi_ras_late_init/amdgpu_xgmi_ras_fini function code drm/amdgpu: Optimize operating sysfs and interrupt function interface in amdgpu_ras.c drm/amdgpu: Merge amdgpu_ras_late_init/amdgpu_ras_late_fini to amdgpu_ras_block_late_init/amdgpu_ras_block_late_fini drm/amdgpu: Modify .ras_late_init function pointer parameter drm/amdgpu: Remove redundant calls of ras_late_init in hdp ras block drm/amdgpu: Remove redundant calls of ras_late_init in mmhub ras block drm/amdgpu: Remove redundant calls of ras_late_init in mca ras block drm/amdgpu: Optimize xxx_ras_late_init function of each ras block drm/amdgpu: define amdgpu_ras_late_init to call all ras blocks' .ras_late_init drm/amdgpu: Remove redundant .ras_late_init initialization in some ras blocks drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 55 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 517 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 46 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 45 +- drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 44 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 44 +- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 106 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 30 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 50 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 48 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 46 +- drivers/gpu/drm/amd/amdgpu/cik.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 138 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 16 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 21 +- drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 52 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 1 + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 7 +- drivers/gpu/drm/amd/amdgpu/nv.c | 33 +- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 7 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 19 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 19 +- drivers/gpu/drm/amd/amdgpu/si.c | 2 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 13 +- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 72 +- drivers/gpu/drm/amd/amdgpu/vi.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 14 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 8 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 23 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 11 +- .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 3 +- .../drm/amd/amdkfd/kfd_device_queue_manager_v10.c | 12 +- .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 3 +- .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_events.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 8 +- drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_iommu.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_module.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 11 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 52 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 29 +- drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 3 +- .../gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_pm4_opcodes.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 30 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 9 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 63 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 12 + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 3 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 264 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 4 + drivers/gpu/drm/amd/display/dc/Makefile | 1 + .../amd/display/dc/bios/command_table_helper2.c | 1 + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 16 + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 2 + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 706 + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.h | 49 + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c | 328 + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.h | 128 + drivers/gpu/drm/amd/display/dc/core/dc.c | 73 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 20 + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 15 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 16 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 16 + drivers/gpu/drm/amd/display/dc/dc.h | 5 +- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 25 +- drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h | 4 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 - drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 23 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn316/Makefile | 56 + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 2306 + .../drm/amd/display/dc/dcn316/dcn316_resource.h | 42 + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- drivers/gpu/drm/amd/display/dmub/src/Makefile | 2 + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.c | 62 + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.h | 33 + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 6 +- drivers/gpu/drm/amd/display/include/dal_types.h | 1 + .../amd/include/asic_reg/dcn/dcn_3_1_6_offset.h | 15682 ++ .../amd/include/asic_reg/dcn/dcn_3_1_6_sh_mask.h | 62717 ++++++++ .../amd/include/asic_reg/dpcs/dpcs_4_2_3_offset.h | 11969 ++ .../amd/include/asic_reg/dpcs/dpcs_4_2_3_sh_mask.h | 136141 ++++++++++++++++++ .../drm/amd/include/asic_reg/mp/mp_13_0_8_offset.h | 410 + .../amd/include/asic_reg/mp/mp_13_0_8_sh_mask.h | 603 + .../amd/include/asic_reg/umc/umc_6_7_0_offset.h | 6 + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 14 + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 19 + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 10 + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 50 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 88 +- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 20 +- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1 + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 9 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 2 + drivers/gpu/drm/radeon/atombios_encoders.c | 3 +- include/uapi/drm/amdgpu_drm.h | 2 + include/uapi/linux/kfd_ioctl.h | 2 +- 156 files changed, 233213 insertions(+), 783 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn316/Makefile create mode 100644 drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn316/dcn316_resource.h create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.c create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn316.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_6_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_1_6_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_3_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_2_3_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_8_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_8_sh_mask.h
