Hi Dave, Daniel, Fixes for 6.0. Mainly fixes for new IPs added in 6.0. The following changes since commit b1fb6b87ed55ced458b322ea10cf0d0ab151e01b: Merge tag 'amd-drm-fixes-6.0-2022-08-17' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes (2022-08-19 09:45:22 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.0-2022-08-25 for you to fetch changes up to b8983d42524f10ac6bf35bbce6a7cc8e45f61e04: drm/amdgpu: mmVM_L2_CNTL3 register not initialized correctly (2022-08-25 13:54:35 -0400) ---------------------------------------------------------------- amd-drm-fixes-6.0-2022-08-25: amdgpu: - GFX 11.0 fixes - PSP XGMI handling fixes - GFX9 fix for compute-only IPs - Drop duplicated function call - Fix warning due to missing header - NBIO 7.7 fixes - DCN 3.1.4 fixes - SDMA 6.0 fixes - SMU 13.0 fixes - Arcturus GPUVM page table fix - MMHUB 1.0 fix amdkfd: - GC 10.3.7 fix radeon: - Delayed work flush fix ---------------------------------------------------------------- Candice Li (1): drm/amdgpu: Check num_gfx_rings for gfx v9_0 rb setup. Evan Quan (1): drm/amd/pm: update SMU 13.0.0 driver_if header Likun Gao (1): drm/amdgpu: add MGCG perfmon setting for gfx11 Maíra Canal (1): drm/amd/display: Include missing header Mukul Joshi (1): drm/amdgpu: Fix page table setup on Arcturus Prike Liang (1): drm/amdkfd: Fix isa version for the GC 10.3.7 Qu Huang (1): drm/amdgpu: mmVM_L2_CNTL3 register not initialized correctly Roman Li (1): drm/amd/display: enable PCON support for dcn314 Tim Huang (5): drm/amdgpu: enable GFXOFF allow control for GC IP v11.0.1 drm/amdgpu: add TX_POWER_CTRL_1 macro definitions for NBIO IP v7.7.0 drm/amdgpu: add NBIO IP v7.7.0 Clock Gating support drm/amdgpu: enable NBIO IP v7.7.0 Clock Gating drm/amdgpu: add sdma instance check for gfx11 CGCG YiPeng Chai (2): drm/amdgpu: Move psp_xgmi_terminate call from amdgpu_xgmi_remove_device to psp_hw_fini drm/amdgpu: fix hive reference leak when adding xgmi device Zhenneng Li (1): drm/radeon: add a force flush to delay work when radeon shaoyunl (1): drm/amdgpu: Remove the additional kfd pre reset call for sriov drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 24 ++++--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 12 +++- drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 78 ++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/soc21.c | 22 ++++-- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 5 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 8 --- .../drm/amd/display/dc/dcn314/dcn314_resource.c | 1 + .../amd/include/asic_reg/nbio/nbio_7_7_0_offset.h | 2 + .../amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h | 13 ++++ .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 31 +++++---- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 3 + 18 files changed, 173 insertions(+), 47 deletions(-)