Hi Dave, Daniel, Fixes for 5.16. The following changes since commit 48737ac4d70faffeb516e2a9847e24f9a7eee05f: drm/amdgpu/psp: add some missing cases to psp_check_pmfw_centralized_cstate_management (2021-10-13 22:51:41 -0400) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.16-2021-10-22 for you to fetch changes up to 41ad36623fabe7d02c9f89aff077dd4c8ba5d602: amd/display: remove ChromeOS workaround (2021-10-22 10:11:52 -0400) ---------------------------------------------------------------- amd-drm-next-5.16-2021-10-22: amdgpu: - PSP fix for resume - XGMI fixes - Interrupt fix in device tear down - Renoir USB-C DP alt mode fix for resume - DP 2.0 fixes - Yellow Carp display fixes - Misc display fixes - RAS fixes - IP Discovery enumeration fixes - VGH fixes - SR-IOV fixes - Revert ChromeOS workaround in display code - Cyan Skillfish fixes amdkfd: - Fix error handling in gpu memory allocation - Fix build warnings with some configs - SVM fixes ---------------------------------------------------------------- Aaron Liu (1): drm/amdgpu: support B0&B1 external revision id for yellow carp Agustin Gutierrez (2): Revert "drm/amd/display: Fix error in dmesg at boot" Revert "drm/amd/display: Add helper for blanking all dp displays" Alex Deucher (15): drm/amdgpu/pm: properly handle sclk for profiling modes on vangogh drm/amdgpu/gfx10: fix typo in gfx_v10_0_update_gfx_clock_gating() drm/amdkfd: protect hawaii_device_info with CONFIG_DRM_AMDGPU_CIK drm/amdkfd: protect raven_device_info with KFD_SUPPORT_IOMMU_V2 drm/amdgpu: drop soc15_set_ip_blocks() drm/amdgpu: drop nv_set_ip_blocks() drm/amdgpu: drop navi reg init functions drm/amdgpu/vcn3.0: handle harvesting in firmware setup drm/amdgpu: Consolidate VCN firmware setup code drm/amdgpu/vcn2.0: remove intermediate variable drm/amdgpu/vcn3.0: remove intermediate variable drm/amdgpu: Workaround harvesting info for some navy flounder boards drm/amdgpu/swsmu: handle VCN harvesting for VCN SMU setup drm/amdgpu/smu11.0: add missing IP version check drm/amdgpu/nbio7.4: use original HDP_FLUSH bits Anthony Koo (2): drm/amd/display: Change initializer to single brace drm/amd/display: [FW Promotion] Release 0.0.88 Aric Cyr (2): drm/amd/display: Validate plane rects before use drm/amd/display: 3.2.157 Eric Yang (1): drm/amd/display: increase Z9 latency to workaround underflow in Z9 Guchun Chen (1): drm/amdgpu/discovery: parse hw_id_name for SDMA instance 2 and 3 Hansen (1): drm/amd/display: Fix DP2 SE and LE SYMCLK selection for B0 PHY Huang Rui (1): drm/amdgpu: remove grbm cam index/data operations for gfx v10 Jake Wang (6): drm/amd/display: Disable dpp root clock when not being used drm/amd/display: Disable dsc root clock when not being used drm/amd/display: Disable dpstreamclk, symclk32_se, and symclk32_le drm/amd/display: Removed z10 save after dsc disable drm/amd/display: Moved dccg init to after bios golden init drm/amd/display: Disable hdmistream and hdmichar clocks Jimmy Kizito (2): drm/amd/display: Clear encoder assignment for copied streams drm/amd/display: Do not skip link training on DP quick hot plug Jingwen Chen (1): drm/amd/amdgpu: add dummy_page_addr to sriov msg Jonathan Kim (1): drm/amdkfd: map gpu hive id to xgmi connected cpu Josip Pavic (1): drm/amd/display: do not compare integers of different widths Kent Russell (1): drm/amdgpu: Clarify error when hitting bad page threshold Lai, Derek (1): drm/amd/display: Removed power down on boot from DCN31 Lang Yu (1): drm/amdkfd: Fix an inappropriate error handling in allloc memory of gpu Lijo Lazar (1): drm/amd/pm: Disable fan control if not supported Michael Strauss (1): drm/amd/display: Clean Up VPG Low Mem Power Mikita Lipski (1): drm/amd/display: Add missing PSR state Nevenko Stupar (1): drm/amd/display: Add bios parser support for latest firmware_info Nicholas Kazlauskas (2): drm/amd/display: Fix prefetch bandwidth calculation for DCN3.1 drm/amd/display: Require immediate flip support for DCN3.1 planes Nikola Cornij (2): drm/amd/display: Limit display scaling to up to true 4k for DCN 3.1 drm/amd/display: Increase watermark latencies for DCN3.1 Philip Yang (2): drm/amdkfd: clarify the origin of cpages returned by migration functions drm/amdkfd: debug message to count successfully migrated pages Qing Wang (1): drm/amdgpu: replace snprintf in show functions with sysfs_emit Roman Li (1): drm/amd/display: Fully switch to dmub for all dcn21 asics Simon Ser (1): amd/display: remove ChromeOS workaround Tao Zhou (3): drm/amdgpu: load PSP RL in resume path drm/amdgpu: centralize checking for RAS TA status drm/amdgpu: output warning for unsupported ras error inject (v2) Vignesh Chander (1): drm/amd/pm: Enable GPU metrics for One VF mode Wenjing Liu (2): drm/amd/display: add DP2.0 debug option to set MST_EN for SST stream drm/amd/display: correct apg audio channel enable golden value YuBiao Wang (1): drm/amd/amdgpu: Do irq_fini_hw after ip_fini_early drivers/gpu/drm/amd/amdgpu/Makefile | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 34 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 27 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 3 +- drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c | 54 ---- .../gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c | 51 ---- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 27 +- drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c | 55 ---- drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c | 52 ---- drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c | 53 ---- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 ++ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 1 + drivers/gpu/drm/amd/amdgpu/nv.c | 295 +-------------------- drivers/gpu/drm/amd/amdgpu/nv.h | 10 - .../gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c | 54 ---- drivers/gpu/drm/amd/amdgpu/soc15.c | 179 ------------- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 - drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 7 +- drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c | 50 ---- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 17 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 28 +- drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c | 51 ---- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 64 +++-- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 19 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 54 +--- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 90 ++++++- .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 21 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 10 - drivers/gpu/drm/amd/display/dc/core/dc_link.c | 63 +---- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 32 +-- .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 9 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 5 + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 1 - drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 2 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 24 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 49 +++- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 34 ++- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 39 ++- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 237 ++++++++++++++++- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 34 ++- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 115 ++++---- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 17 +- .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 6 +- drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 9 + drivers/gpu/drm/amd/display/dc/inc/link_enc_cfg.h | 2 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- drivers/gpu/drm/amd/display/include/dal_asic_id.h | 2 +- .../amd/include/asic_reg/dcn/dcn_3_1_2_offset.h | 2 + .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 8 + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 14 +- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 14 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 95 ++----- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 89 ++----- 70 files changed, 897 insertions(+), 1407 deletions(-) delete mode 100644 drivers/gpu/drm/amd/amdgpu/beige_goby_reg_init.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/navi10_reg_init.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/navi12_reg_init.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/navi14_reg_init.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/sienna_cichlid_reg_init.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/vangogh_reg_init.c delete mode 100644 drivers/gpu/drm/amd/amdgpu/yellow_carp_reg_init.c
