Hi Dave, Daniel, Fixes for 6.0. A bit bigger than usual, but this is mainly caused by some regression fixes which took a while to sort out and validate. The rest is fixes for new IPs added in the 6.0 cycle. The following changes since commit 2edb79a5fb303dff577d6a0c7d571c3bab1d1455: Merge tag 'drm-intel-fixes-2022-09-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2022-09-10 01:42:47 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-fixes-6.0-2022-09-14 for you to fetch changes up to a8671493d2074950553da3cf07d1be43185ef6c6: drm/amdgpu: make sure to init common IP before gmc (2022-09-14 14:21:49 -0400) ---------------------------------------------------------------- amd-drm-fixes-6.0-2022-09-14: amdgpu: - BACO fixes for some RDNA2 boards - PCI AER fixes uncovered by a core PCI change - Properly hook up dirtyfb helper - RAS fixes for GC 11.x - TMR fix - DCN 3.2.x fixes - DCN 3.1.4 fixes - LLVM DML stack size fixes ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu: add HDP remap functionality to nbio 7.7 drm/amdgpu: move nbio ih_doorbell_range() into ih code for vega drm/amdgpu: move nbio sdma_doorbell_range() into sdma code for vega drm/amdgpu: make sure to init common IP before gmc Alvin Lee (3): drm/amd/display: Update MBLK calculation for SubVP drm/amd/display: SW cursor fallback for SubVP drm/amd/display: Refactor SubVP calculation to remove FPU Aric Cyr (1): drm/amd/display: Fix divide by zero in DML Aurabindo Pillai (2): drm/amd/display: Revert "Fallback to SW cursor if SubVP + cursor too big" drm/amd/display: add workaround for subvp cursor corruption for DCN32/321 Candice Li (2): drm/amdgpu: Enable full reset when RAS is supported on gc v11_0_0 drm/amdgpu: Skip reset error status for psp v13_0_0 Duncan Ma (1): drm/amd/display: Correct dram channel width for dcn314 Guchun Chen (1): drm/amd/pm: disable BACO entry/exit completely on several sienna cichlid cards Hamza Mahfooz (1): drm/amdgpu: use dirty framebuffer helper Leo Chen (1): drm/amd/display: Fixing DIG FIFO Error Lijo Lazar (1): drm/amdgpu: Don't enable LTR if not supported Nathan Chancellor (5): drm/amd/display: Reduce number of arguments of dml32_CalculateWatermarksMALLUseAndDRAMSpeedChangeSupport() drm/amd/display: Reduce number of arguments of dml32_CalculatePrefetchSchedule() drm/amd/display: Reduce number of arguments of dml31's CalculateWatermarksAndDRAMSpeedChangeSupport() drm/amd/display: Reduce number of arguments of dml31's CalculateFlipSchedule() drm/amd/display: Mark dml30's UseMinimumDCFCLK() as noinline for stack usage Nicholas Kazlauskas (2): drm/amd/display: Hook up DCN314 specific dml implementation drm/amd/display: Relax swizzle checks for video non-RGB formats on DCN314 Rodrigo Siqueira (2): drm/amd/display: Fix compilation errors on DCN314 drm/amd/display: Enable dlg and vba compilation for dcn314 Taimur Hassan (1): drm/amd/display: Round cursor width up for MALL allocation Yang Wang (1): drm/amdgpu: change the alignment size of TMR BO to 1M Yao Wang1 (1): drm/amd/display: Limit user regamma to a valid value drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 9 +- drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 9 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 9 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 9 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 + drivers/gpu/drm/amd/amdgpu/soc15.c | 25 -- drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 4 + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 4 + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 1 + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 89 +++-- .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 3 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 24 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 24 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 4 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 3 + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 59 ++- .../drm/amd/display/dc/dcn321/dcn321_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 3 +- .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 420 +++++---------------- .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 5 +- .../display/dc/dml/dcn314/display_mode_vba_314.c | 13 +- .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 260 +++++-------- .../dc/dml/dcn32/display_mode_vba_util_32.c | 323 +++++++--------- .../dc/dml/dcn32/display_mode_vba_util_32.h | 51 +-- .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 12 + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 10 +- drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + .../drm/amd/display/modules/color/color_gamma.c | 4 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 11 + 39 files changed, 595 insertions(+), 834 deletions(-)