Hi Dave, Daniel, Fixes for 6.1. Fairly big, but most of these have been baking for a while; just wrapping them up now so they should be pretty well tested. The following changes since commit eb7081409f94a9a8608593d0fb63a1aa3d6f95d8: Linux 6.1-rc6 (2022-11-20 16:02:16 -0800) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.1-2022-11-23 for you to fetch changes up to ecb41b71ef90cf4741bcc3286b769dda746b67e6: drm/amdgpu/vcn: re-use original vcn0 doorbell value (2022-11-23 09:01:54 -0500) ---------------------------------------------------------------- amd-drm-fixes-6.1-2022-11-23: amdgpu: - DCN 3.1.4 fixes - DP MST DSC deadlock fixes - HMM userptr fixes - Fix Aldebaran CU occupancy reporting - GFX11 fixes - PSP suspend/resume fix - DCE12 KASAN fix - DCN 3.2.x fixes - Rotated cursor fix - SMU 13.x fix - DELL platform suspend/resume fixes - VCN4 SR-IOV fix - Display regression fix for polled connectors ---------------------------------------------------------------- Alex Deucher (2): drm/amdgpu/psp: don't free PSP buffers on suspend drm/amdgpu: Partially revert "drm/amdgpu: update drm_display_info correctly when the edid is read" Christian König (2): drm/amdgpu: always register an MMU notifier for userptr drm/amdgpu: fix userptr HMM range handling v2 David Galiffi (1): drm/amd/display: Fix rotated cursor offset calculation Dillon Varone (3): drm/amd/display: Update soc bounding box for dcn32/dcn321 drm/amd/display: Use viewport height for subvp mall allocation size drm/amd/display: Use new num clk levels struct for max mclk index Jack Xiao (1): drm/amd/amdgpu: reserve vm invalidation engine for firmware Jane Jian (1): drm/amdgpu/vcn: re-use original vcn0 doorbell value Lyude Paul (6): drm/amdgpu/mst: Stop ignoring error codes and deadlocking drm/display/dp_mst: Fix drm_dp_mst_add_affected_dsc_crtcs() return code drm/amdgpu/dm/mst: Use the correct topology mgr pointer in amdgpu_dm_connector drm/amdgpu/dm/dp_mst: Don't grab mst_mgr->lock when computing DSC state drm/amdgpu/dm/mst: Fix uninitialized var in pre_compute_mst_dsc_configs_for_state() drm/amd/dc/dce120: Fix audio register mapping, stop triggering KASAN Ramesh Errabolu (1): drm/amdgpu: Enable Aldebaran devices to report CU Occupancy Roman Li (1): drm/amd/display: Align dcn314_smu logging with other DCNs Stanley.Yang (1): drm/amdgpu: fix use-after-free during gpu recovery Taimur Hassan (1): drm/amd/display: Avoid setting pixel rate divider to N/A Tsung-hua Lin (1): drm/amd/display: No display after resume from WB/CB lyndonli (1): drm/amd/pm: update driver if header for smu_13_0_7 .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 53 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 14 +- drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h | 1 - drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 9 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 55 ++++- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 254 +++++++++++---------- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c | 11 +- .../drm/amd/display/dc/dce120/dce120_resource.c | 3 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 34 ++- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 28 ++- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 32 ++- .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 7 + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 6 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 4 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 4 +- .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 2 +- .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 8 +- .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 8 +- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h | 117 +++++++--- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- 32 files changed, 440 insertions(+), 294 deletions(-)