Hi Dave, Daniel, Updates for 6.1. The following changes since commit 213cb76ddc8b875e772f9f4d173feefa122716af: Merge tag 'drm-intel-gt-next-2022-09-09' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2022-09-12 21:12:23 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-6.1-2022-09-16 for you to fetch changes up to dacd2d2d9d800b7ab2ee2734578112532cba8105: drm/amd/display: fix boolconv.cocci warning (2022-09-14 12:38:53 -0400) ---------------------------------------------------------------- amd-drm-next-6.1-2022-09-16: amdgpu: - PCI AER fixes - BACO fix - RAS fixes - XGMI fixes - Display SubVP fixes - DCN 3.2 updates - DCN 3.1.4 updates - LLVM fixes - CS cleanup in preparation for gang submit - Add some new GC CG registers - Misc cleanups amdkfd: - Fix CRIU regression - CPU fault on COW mapping fixes - Prefault fixes - Misc cleanups radeon: - Misc cleanups ---------------------------------------------------------------- Alex Deucher (5): drm/amdgpu: add HDP remap functionality to nbio 7.7 drm/amdgpu: fix warning about missing imu prototype 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 (4): drm/amd/display: Update MBLK calculation for SubVP drm/amd/display: SW cursor fallback for SubVP drm/amd/display: Update viewport position for phantom pipes drm/amd/display: Refactor SubVP calculation to remove FPU Aric Cyr (4): drm/amd/display: Optimizations for DML math drm/amd/display: Fix divide by zero in DML drm/amd/display: Don't adjust VRR unnecessarily drm/amd/display: 3.2.202 Aurabindo Pillai (3): 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 drm/amd/display: Fix register definitions for DCN32/321 Candice Li (4): drm/amdgpu: Rely on MCUMC_STATUS for umc v8_10 correctable error counter only drm/amdgpu: Enable full reset when RAS is supported on gc v11_0_0 drm/amdgpu: Add EEPROM I2C address for smu v13_0_0 drm/amdgpu: Skip reset error status for psp v13_0_0 Charlene Liu (1): drm/amd/display: update header files Chris Park (1): drm/amd/display: Correct I2C register offset Christian König (6): drm/amdgpu: remove SRIOV and MCBP dependencies from the CS drm/amdgpu: move setting the job resources drm/amdgpu: revert "partial revert "remove ctx->lock" v2" drm/amdgpu: use DMA_RESV_USAGE_BOOKKEEP v2 drm/amdgpu: cleanup CS init/fini and pass1 drm/amdgpu: reorder CS code 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 JeromeHong (1): drm/amd/display: Avoid force minimal transaction in case of surface_count equal to 0 Jiapeng Chong (13): drm/amd/display: make enc32_stream_encoder_dvi_set_stream_attribute static drm/amd/display: make dscl32_calc_lb_num_partitions static drm/amd/display: make dcn32_link_encoder_is_in_alt_mode and dcn32_link_encoder_get_max_link_cap static drm/amd/display: make mpc32_program_shaper and mpc32_program_3dlut static drm/amd/display: Remove the unused function copy_stream_update_to_stream() drm/amd/display: make some functions static drm/amd/display: make enc314_stream_encoder_dvi_set_stream_attribute static drm/amd/display: make optc314_phantom_crtc_post_enable static drm/amd/display: make some functions static drm/amd/display: make mmhubbub32_config_mcif_buf static drm/amd/display: make some functions static drm/amd/display: make some functions static drm/amd/display: make optc32_phantom_crtc_post_enable, optc32_setup_manual_trigger and optc32_set_drr static Jilin Yuan (1): drm/amd/display: fix repeated words in comments JinZe.Xu (1): drm/amd/display: Assign link type before check dsc workaround. Jingyu Wang (5): drm/amdgpu: cleanup coding style in amdgpu_acpi.c drm/amdgpu: cleanup coding style in amdgpu_sync.c file drm/amdgpu: cleanup coding style in amdgpu_amdkfd.c drm/amdgpu: cleanup coding style in amdgpu_amdkfd_gpuvm.c drm/amdgpu/display: remove unneeded "default n" options John Clements (1): drm/amdgpu: added support for ras driver loading Lee, Alvin (1): drm/amd/display: Added debug option for forcing subvp num ways Leo Chen (2): drm/amd/display: Fixing DIG FIFO Error drm/amd/display: Adding log for spread_spectrum_info Li Ma (1): drm/amd/pm:add new gpu_metrics_v2_3 to acquire average temperature info Lijo Lazar (1): drm/amdgpu: Don't enable LTR if not supported Nagulendran, Iswara (1): drm/amd/display: Reverted DSC programming sequence change 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 Philip Yang (3): drm/amdkfd: handle CPU fault on COW mapping drm/amdkfd: Remove prefault before migrating to VRAM drm/amdkfd: Migrate in CPU page fault use current mm Rafael Mendonca (1): drm/amdgpu: Fix memory leak in hpd_rx_irq_create_workqueue() Rajneesh Bhardwaj (1): drm/amdkfd: Fix CRIU restore op due to doorbell offset 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 Tom St Denis (1): drm/amd/amdgpu: update GC 10.3.0 pwrdec Vignesh Chander (1): drm/amdgpu: Fix hive reference count leak Xu Panda (1): drm/amd/display/amdgpu_dm: remove duplicate included header files Yang Li (3): drm/amd/display: clean up some inconsistent indentings drm/amd/display: Simplify bool conversion drm/amd/display: remove possible condition with no effect (if == else) 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 Yihao Han (1): drm/amd/display: fix boolconv.cocci warning shaoyunl (1): drm/amdgpu: Use per device reset_domain for XGMI on sriov configuration wangjianli (1): amd/amdkfd: fix repeated words in comments ye xingchen (2): drm/radeon/ci_dpm: Remove the unneeded result variable drm/radeon: Remove the unneeded result variable zhang songyi (1): drm/amdgpu: Remove the unneeded result variable drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 30 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1349 +++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 36 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 17 + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 10 + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 37 +- drivers/gpu/drm/amd/amdgpu/imu_v11_0_3.c | 1 + 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/psp_v13_0.c | 7 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 25 - drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 12 +- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 4 + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 4 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 3 + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 57 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 7 + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 22 - drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 - drivers/gpu/drm/amd/display/Kconfig | 2 - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 - drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 20 + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc.c | 25 +- .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 16 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 4 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 89 +- drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 13 - drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 7 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.c | 3 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h | 8 - .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 6 +- .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 5 +- .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 8 +- .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 4 +- .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dpp.c | 2 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 8 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 24 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 56 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 4 + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.c | 2 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h | 10 - drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 6 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 6 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 40 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 236 ++-- .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 62 +- .../drm/amd/display/dc/dcn321/dcn321_resource.c | 37 +- drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 + .../drm/amd/display/dc/dml/calcs/dcn_calc_auto.c | 22 +- .../drm/amd/display/dc/dml/calcs/dcn_calc_math.c | 16 +- .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 10 +- .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 6 +- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 10 +- .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 426 ++---- .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 5 +- .../display/dc/dml/dcn314/display_mode_vba_314.c | 19 +- .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 260 ++-- .../dc/dml/dcn32/display_mode_vba_util_32.c | 360 +++-- .../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 +- .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 9 +- drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 + .../drm/amd/display/modules/color/color_gamma.c | 4 + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 100 ++ .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 1459 +++++++++++++++++++- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 58 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 11 + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 160 ++- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + drivers/gpu/drm/radeon/ci_dpm.c | 6 +- drivers/gpu/drm/radeon/radeon_drv.c | 5 +- 102 files changed, 3599 insertions(+), 1911 deletions(-)
