Hi Dave, Sima, Fixes for 6.7. The following changes since commit 5258dfd4a6adb5f45f046b0dd2e73c680f880d9d: usb: typec: altmodes/displayport: fixup drm internal api change vs new user. (2023-10-27 07:55:41 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-6.7-2023-10-27 for you to fetch changes up to dd3dd9829bf9a4ecd55482050745efdd9f7f97fc: drm/amdgpu: Remove unused variables from amdgpu_show_fdinfo (2023-10-27 14:23:01 -0400) ---------------------------------------------------------------- amd-drm-next-6.7-2023-10-27: amdgpu: - RAS fixes - Seamless boot fixes - NBIO 7.7 fix - SMU 14.0 fixes - GC 11.5 fixes - DML2 fixes - ASPM fixes - VPE fixes - Misc code cleanups - SRIOV fixes - Add some missing copyright notices - DCN 3.5 fixes - FAMS fixes - Backlight fix - S/G display fix - fdinfo cleanups - EXT_COHERENT fixes for APU and NUMA systems amdkfd: - Misc fixes - Misc code cleanups - SVM fixes ---------------------------------------------------------------- Agustin Gutierrez (1): drm/amd/display: Remove power sequencing check Alex Hung (2): drm/amd/display: Revert "drm/amd/display: allow edp updates for virtual signal" drm/amd/display: Set emulated sink type to HDMI accordingly. Alvin Lee (1): drm/amd/display: Update FAMS sequence for DCN30 & DCN32 Aric Cyr (1): drm/amd/display: 3.2.256 Aurabindo Pillai (1): drm/amd/display: add interface to query SubVP status Candice Li (2): drm/amdgpu: Identify data parity error corrected in replay mode drm/amdgpu: Retrieve CE count from ce_count_lo_chip in EccInfo table David Francis (1): drm/amdgpu: Add EXT_COHERENT support for APU and NUMA systems Fangzhi Zuo (1): drm/amd/display: Fix MST Multi-Stream Not Lighting Up on dcn35 George Shen (1): drm/amd/display: Update SDP VSC colorimetry from DP test automation request Hamza Mahfooz (1): drm/amd/display: fix S/G display enablement Hugo Hu (1): drm/amd/display: reprogram det size while seamless boot Ilya Bakoulin (1): drm/amd/display: Fix shaper using bad LUT params Iswara Nagulendran (1): drm/amd/display: Read before writing Backlight Mode Set Register James Zhu (1): drm/amdxcp: fix amdxcp unloads incompletely Jesse Zhang (1): drm/amdkfd: Fix shift out-of-bounds issue Jiadong Zhu (2): drm/amd/pm: drop unneeded dpm features disablement for SMU 14.0.0 drm/amdgpu: add tmz support for GC IP v11.5.0 Kenneth Feng (1): drm/amd/amdgpu: avoid to disable gfxhub interrupt when driver is unloaded Lang Yu (1): drm/amdgpu/vpe: correct queue stop programing Li Ma (2): drm/amdgpu: modify if condition in nbio_v7_7.c drm/amd/amdgpu: fix the GPU power print error in pm info Lijo Lazar (4): drm/amdgpu: Add API to get full IP version drm/amdgpu: Use discovery table's subrevision drm/amdgpu: Add a read to GFX v9.4.3 ring test drm/amdgpu: Use pcie domain of xcc acpi objects Lin.Cao (2): drm/amdgpu remove restriction of sriov max_pfn on Vega10 drm/amd: check num of link levels when update pcie param Ma Jun (1): drm/amd/pm: Fix the return value in default case Mario Limonciello (4): drm/amd: Disable ASPM for VI w/ all Intel systems drm/amd: Disable PP_PCIE_DPM_MASK when dynamic speed switching not supported drm/amd: Move AMD_IS_APU check for ASPM into top level function drm/amd: Explicitly disable ASPM when dynamic switching disabled Michael Strauss (1): drm/amd/display: Disable SYMCLK32_SE RCO on DCN314 Mukul Joshi (1): drm/amdgpu: Fix typo in IP discovery parsing Nicholas Kazlauskas (2): drm/amd/display: Revert "Improve x86 and dmub ips handshake" drm/amd/display: Fix IPS handshake for idle optimizations Philip Yang (2): Revert "drm/amdkfd:remove unused code" Revert "drm/amdkfd: Use partial migrations in GPU page faults" Qu Huang (1): drm/amdgpu: Fix a null pointer access when the smc_rreg pointer is NULL Rob Clark (1): drm/amdgpu: Remove duplicate fdinfo fields Rodrigo Siqueira (5): drm/amd/display: Set the DML2 attribute to false in all DCNs older than version 3.5 drm/amd/display: Fix DMUB errors introduced by DML2 drm/amd/display: Correct enum typo drm/amd/display: Add prefix to amdgpu crtc functions drm/amd/display: Add prefix for plane functions Samson Tam (2): drm/amd/display: fix num_ways overflow error drm/amd/display: add null check for invalid opps Srinivasan Shanmugam (1): drm/amdkfd: Address 'remap_list' not described in 'svm_range_add' Stylon Wang (3): drm/amd/display: Add missing copyright notice in DMUB drm/amd/display: Fix copyright notice in DML2 code drm/amd/display: Fix copyright notice in DC code Sung Joon Kim (2): drm/amd/display: Add a check for idle power optimization drm/amd/display: Fix HDMI framepack 3D test issue Swapnil Patel (1): drm/amd/display: Reduce default backlight min from 5 nits to 1 nits Tao Zhou (4): drm/amd/pm: record mca debug mode in RAS drm/amdgpu: enable RAS poison mode for APU drm/amdgpu: bypass RAS error reset in some conditions drm/amdgpu: get RAS poison status from DF v4_6_2 Umio Yasuno (1): drm/amdgpu: Remove unused variables from amdgpu_show_fdinfo Wenjing Liu (2): drm/amd/display: add pipe resource management callbacks to DML2 drm/amd/display: implement map dc pipe with callback in DML2 Yang Wang (2): drm/amdgpu: fix find ras error node error drm/amdgpu: refine ras error kernel log print Yifan Zhang (1): drm/amd/pm: call smu_cmn_get_smc_version in is_mode1_reset_supported. drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 40 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 25 +- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 9 - drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 136 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 2 +- drivers/gpu/drm/amd/amdgpu/cik.c | 4 - drivers/gpu/drm/amd/amdgpu/df_v4_6_2.c | 34 ++ drivers/gpu/drm/amd/amdgpu/df_v4_6_2.h | 31 ++ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 40 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 4 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 9 +- drivers/gpu/drm/amd/amdgpu/nv.c | 10 +- drivers/gpu/drm/amd/amdgpu/si.c | 2 - drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +- drivers/gpu/drm/amd/amdgpu/soc21.c | 3 +- drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 32 +- drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 12 +- drivers/gpu/drm/amd/amdgpu/vi.c | 5 +- drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | 18 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 150 +++--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 154 +++--- drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 9 +- drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 7 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 48 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 542 +++++++++++---------- .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 26 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 11 +- drivers/gpu/drm/amd/display/dc/dc.h | 4 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 26 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 1 + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 3 +- .../drm/amd/display/dc/dcn302/dcn302_resource.c | 1 + .../gpu/drm/amd/display/dc/dcn303/dcn303_dccg.h | 18 + .../gpu/drm/amd/display/dc/dcn303/dcn303_init.c | 18 + .../gpu/drm/amd/display/dc/dcn303/dcn303_init.h | 18 + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 19 + .../drm/amd/display/dc/dcn303/dcn303_resource.h | 18 + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 23 + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 5 +- .../drm/amd/display/dc/dcn315/dcn315_resource.c | 1 + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 2 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 9 +- .../drm/amd/display/dc/dcn321/dcn321_resource.c | 9 +- drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.c | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.h | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.c | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.h | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.h | 2 + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c | 2 + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.h | 2 + .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.c | 2 + .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.h | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.c | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.h | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.c | 2 + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.h | 2 + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c | 2 + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h | 2 + .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.c | 7 + .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.h | 2 + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 4 +- drivers/gpu/drm/amd/display/dc/dml2/cmntypes.h | 2 + .../drm/amd/display/dc/dml2/display_mode_core.c | 2 + .../display/dc/dml2/display_mode_core_structs.h | 2 + .../amd/display/dc/dml2/display_mode_lib_defines.h | 2 + .../drm/amd/display/dc/dml2/display_mode_util.c | 2 + .../drm/amd/display/dc/dml2/display_mode_util.h | 2 + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 148 ++++++ .../amd/display/dc/dml2/dml2_dc_resource_mgmt.h | 2 + .../gpu/drm/amd/display/dc/dml2/dml2_dc_types.h | 2 + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 2 + .../drm/amd/display/dc/dml2/dml2_mall_phantom.c | 2 + .../drm/amd/display/dc/dml2/dml2_mall_phantom.h | 2 + drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c | 2 + .../amd/display/dc/dml2/dml2_translation_helper.c | 4 + .../amd/display/dc/dml2/dml2_translation_helper.h | 2 + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 2 + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 2 + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 18 + drivers/gpu/drm/amd/display/dc/dml2/dml_assert.h | 2 + .../gpu/drm/amd/display/dc/dml2/dml_depedencies.h | 2 + drivers/gpu/drm/amd/display/dc/dml2/dml_logging.h | 2 + drivers/gpu/drm/amd/display/dc/hdcp/Makefile | 2 +- .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 6 + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 21 +- .../drm/amd/display/dc/hwss/dcn303/dcn303_hwseq.c | 19 + .../drm/amd/display/dc/hwss/dcn303/dcn303_hwseq.h | 19 + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 11 + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 39 +- .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 3 + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 10 +- .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 2 + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 2 +- .../amd/display/dc/irq/dcn303/irq_service_dcn303.c | 19 + .../amd/display/dc/irq/dcn303/irq_service_dcn303.h | 19 + drivers/gpu/drm/amd/display/dc/irq_types.h | 6 +- .../amd/display/dc/link/accessories/link_dp_cts.c | 6 + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 3 +- .../dc/link/protocols/link_edp_panel_control.c | 11 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.c | 19 + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn303.h | 19 + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 1 + drivers/gpu/drm/amd/display/include/signal_types.h | 1 - drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 7 +- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 10 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 10 +- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 5 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 1 + 137 files changed, 1474 insertions(+), 698 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_6_2.c create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_6_2.h
