Hi Dave, Daniel, Last few updates for 6.6. Mostly bug fixes. The following changes since commit a8b273a8fd9c88cee038ffdae05b7eca063b9622: Merge tag 'amd-drm-next-6.6-2023-08-11' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2023-08-15 13:37:49 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-6.6-2023-08-18 for you to fetch changes up to ef35c7ba60410926d0501e45aad299656a83826c: Revert "Revert "drm/amdgpu/display: change pipe policy for DCN 2.0"" (2023-08-16 11:38:18 -0400) ---------------------------------------------------------------- amd-drm-next-6.6-2023-08-18: amdgpu: - Panel replay fixes - Misc checkpatch fixes - SMU 13.x fixes - mcbp parameter handling fix for gfx9 - RAS fixes - Misc code cleanups - SR-IOV fixes - Expose both current and average power via hwmon if supported - DP retimer fix - Clockgating fix - Subvp fixes - DMCUB fixes - Gamut remap fix - Misc display fixes - Allow users to force runtime pm when displays are attached - Gracefully handle more partitions than drm nodes - S0ix fixes - GC 9.4.3 fixes amdkfd: - TBA fix for aldebaran - Fix build without CONFIG_DYNAMIC_DEBUG - memdup cleanup - Fix address watch clearing radeon: - Misc code cleanups ---------------------------------------------------------------- Alex Deucher (2): drm/amdgpu: expand runpm parameter Revert "Revert "drm/amdgpu/display: change pipe policy for DCN 2.0"" Alvin Lee (2): drm/amd/display: Enable subvp high refresh up to 175hz drm/amd/display: PMFW to wait for DMCUB ack for FPO cases Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.179.0 Aric Cyr (1): drm/amd/display: Promote DAL to 3.2.247 Arnd Bergmann (1): drm/amdkfd: fix build failure without CONFIG_DYNAMIC_DEBUG Asad Kamal (3): drm/amd/pm: Add vclk and dclk sysnode for GC 9.4.3 drm/amd/pm: Update pci link width for smu v13.0.6 drm/amd/pm: Update pci link speed for smu v13.0.6 Atul Raut (1): drm/amdkfd: Use memdup_user() rather than duplicating its implementation Aurabindo Pillai (3): drm/amd/display: Add some missing register definitions drm/amd: Remove freesync video mode amdgpu parameter drm/amd/display: enable low power mode for VGA memory Bhawanpreet Lakha (4): drm/amd/display: Add Replay supported/enabled checks drm/amd/display: Update replay for clk_mgr optimizations drm/amd/display: Update adaptive sync infopackets for replay drm/amd/display: Handle Replay related hpd irq Candice Li (1): drm/amdgpu: Add I2C EEPROM support on smu v13_0_6 Charlene Liu (1): drm/amd/display: avoid crash and add z8_marks related in dml Eric Huang (1): drm/amdkfd: workaround address watch clearing bug for gfx v9.4.2 Evan Quan (2): drm/amd/pm: correct the way for checking custom OD settings drm/amd/pm: correct the logics for retreiving SMU13 OD setting limits GUO Zihua (1): drm/amdgpu: Remove duplicated includes Hawking Zhang (1): drm/amdgpu: Remove unnecessary ras cap check James Zhu (1): drm/amdgpu: skip xcp drm device allocation when out of drm resource Jay Cornwall (1): drm/amdkfd: Add missing tba_hi programming on aldebaran Jiadong Zhu (1): drm/amdgpu: disable mcbp if parameter zero is set Jonathan Kim (1): drm/amdkfd: fix double assign skip process context clear Kenneth Feng (2): drm/amd/pm: disallow the fan setting if there is no fan on smu 13.0.0 drm/amd/pm: allow the user to force BACO on smu v13.0.0/7 Krunoslav Kovac (1): drm/amd/display: Gamut remap only changes missed Lijo Lazar (3): drm/amd/pm: Fix temperature unit of SMU v13.0.6 drm/amdgpu: Remove gfxoff check in GFX v9.4.3 drm/amdgpu: Add memory vendor information Mario Limonciello (10): drm/amd: Add amdgpu_hwmon_get_sensor_generic() drm/amd: Add a new hwmon attribute for instantaneous power drm/amd: Introduce `AMDGPU_PP_SENSOR_GPU_INPUT_POWER` drm/amd: Fix SMU 13.0.4/13.0.11 GPU metrics average power drm/amd: Drop unnecessary helper for aldebaran drm/amd: Fix the return for average power on aldebaran drm/amd: Show both power attributes for vega20 drm/amd: Rename AMDGPU_PP_SENSOR_GPU_POWER drm/amd: Hide unsupported power attributes drm/amd: flush any delayed gfxoff on suspend entry Michael Strauss (1): drm/amd/display: Support Compliance Test Pattern Generation with DP2 Retimer Muhammad Ahmed (1): drm/amd/display: disable clock gating logic reversed bug fix Nicholas Susanto (1): drm/amd/display: Enable 8k60hz mode on single display Ran Sun (2): drm/amd/pm: Clean up errors in smu_v11_0_pptable.h drm/amd/pm: Clean up errors in amdgpu_smu.h Randy Dunlap (1): drm/amd/display: dmub_replay: don't use kernel-doc markers Ruan Jinjie (3): drm/amdkfd: Remove unnecessary NULL values drm/amd/display: Remove unnecessary NULL values drm/radeon: Remove unnecessary NULL values Samir Dhume (7): drm/amdgpu/vcn: Add MMSCH v4_0_3 support for sriov drm/amdgpu/vcn: mmsch_v4_0_3 requires doorbell on 32 byte boundary drm/amdgpu/jpeg: mmsch_v4_0_3 requires doorbell on 32 byte boundary drm/amdgpu/vcn: change end doorbell index for vcn_v4_0_3 drm/amdgpu/vcn: sriov support for vcn_v4_0_3 drm/amdgpu/jpeg: sriov support for jpeg_v4_0_3 drm/amdgpu/vcn: Skip vcn power-gating change for sriov Srinivasan Shanmugam (6): drm/amdgpu: Fix missing comment for mb() in 'amdgpu_device_aper_access' drm/radeon: Fix multiple line dereference in 'atom_iio_execute' drm/amdgpu: Fix identifier names to function definition arguments in atom.h drm/amdgpu: Replace ternary operator with min() in 'amdgpu_iomem_read' drm/amd/display: Replace ternary operator with min() in 'dm_helpers_parse_edid_caps' drm/amdgpu: Replace ternary operator with min() in 'amdgpu_iomem_write' Tim Huang (2): drm/amd/pm: bump SMU v13.0.5 driver_if header version drm/amdgpu: skip fence GFX interrupts disable/enable for S0ix Umio Yasuno (1): drm/amdgpu/pm: fix throttle_status for other than MP1 11.0.7 Wenjing Liu (2): drm/amd/display: fix incorrect stream_res allocation for older ASIC drm/amd/display: implement pipe type definition and adding accessors Xiongfeng Wang (1): drm/amd: Use pci_dev_id() to simplify the code Yang Wang (1): drm/amd/pm: avoid driver getting empty metrics table for the first time YiPeng Chai (1): drm/amdgpu: mode1 reset needs to recover mp1 for mp0 v13_0_10 Zheng Zengkai (1): drm/radeon: Use pci_dev_id() to simplify the code drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 8 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 64 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 41 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 13 +- drivers/gpu/drm/amd/amdgpu/atom.h | 23 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 2 - drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 26 +- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 188 +++++++++-- drivers/gpu/drm/amd/amdgpu/mmsch_v4_0_3.h | 37 +++ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 24 +- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 282 ++++++++++++++-- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 11 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 6 + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 9 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 4 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 4 +- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 3 + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 5 + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 7 + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h | 1 + drivers/gpu/drm/amd/display/dc/core/dc.c | 47 ++- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 194 ++++++----- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 3 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 25 +- drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 69 ++-- drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 18 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 2 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 5 + .../drm/amd/display/dc/dce110/dce110_resource.c | 2 +- .../drm/amd/display/dc/dce112/dce112_resource.c | 4 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 6 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 43 ++- .../drm/amd/display/dc/dcn201/dcn201_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 5 + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 3 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 4 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 4 +- .../drm/amd/display/dc/dcn314/dcn314_resource.c | 8 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 12 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 4 +- .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 12 +- .../gpu/drm/amd/display/dc/dml/calcs/dce_calcs.c | 2 +- .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 2 +- .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 2 +- .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 16 +- drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 + drivers/gpu/drm/amd/display/dc/inc/link.h | 4 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 220 ++++++++++++- drivers/gpu/drm/amd/display/dc/link/Makefile | 3 +- .../amd/display/dc/link/accessories/link_dp_cts.c | 6 +- .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 2 +- .../drm/amd/display/dc/link/hwss/link_hwss_dio.h | 3 + .../link/hwss/link_hwss_dio_fixed_vs_pe_retimer.c | 200 ++++++++++++ .../link/hwss/link_hwss_dio_fixed_vs_pe_retimer.h | 37 +++ .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 22 +- .../amd/display/dc/link/hwss/link_hwss_hpo_dp.h | 28 +- .../hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.c | 229 +++++++++++++ .../hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.h | 33 ++ drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 7 +- drivers/gpu/drm/amd/display/dc/link/link_factory.c | 1 + .../drm/amd/display/dc/link/protocols/link_ddc.c | 82 +++++ .../drm/amd/display/dc/link/protocols/link_ddc.h | 14 + .../dc/link/protocols/link_dp_irq_handler.c | 66 ++++ .../link_dp_training_fixed_vs_pe_retimer.c | 305 +++++------------- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 + .../amd/display/modules/info_packet/info_packet.c | 5 + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 5 + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 5 + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 4 + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 5 +- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 3 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 355 +++++++-------------- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 2 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 2 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 2 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 20 +- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 37 +-- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_5.h | 3 +- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 1 - .../gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h | 15 +- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 3 +- .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 14 +- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 3 +- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 17 +- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 12 +- drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 7 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 24 +- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 103 +++--- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 13 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 7 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 73 +++-- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 99 +++--- .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 7 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 2 + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 8 + drivers/gpu/drm/radeon/atom.c | 10 +- drivers/gpu/drm/radeon/radeon_acpi.c | 2 +- drivers/gpu/drm/radeon/radeon_agp.c | 2 +- drivers/gpu/drm/radeon/radeon_combios.c | 6 +- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 4 +- 120 files changed, 2364 insertions(+), 1122 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_v4_0_3.h create mode 100644 drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_dio_fixed_vs_pe_retimer.c create mode 100644 drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_dio_fixed_vs_pe_retimer.h create mode 100644 drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.c create mode 100644 drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.h
