Hi Dave, Daniel, More updates for 5.15. The following changes since commit 04d505de7f82c8f2daa6139b460b05dc01e354e0: Merge tag 'amd-drm-next-5.15-2021-07-29' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-07-30 16:48:35 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.15-2021-08-06 for you to fetch changes up to a43e2a0e11491b73e2acaa27ee74d6c3b86deac0: drm/amdkfd: Allow querying SVM attributes that are clear (2021-08-06 16:12:32 -0400) ---------------------------------------------------------------- amd-drm-next-5.15-2021-08-06: amdgpu: - Aldebaran fixes - Powergating fix for Renoir - Switch virtual DCE over to vkms based atomic modesetting - Misc typo fixes - PSP handling cleanups - DC FP cleanups - RAS fixes - Wave debug improvements - Freesync fix - BACO/BOCO fixes - Misc fixes amdkfd: - Expose gfx version in sysfs - Aldebaran fixes radeon: - Coding style fix - Typo fixes - Pageflip fix UAPI: - amdkfd: SVM address range query Proposed userspace: https://github.com/RadeonOpenCompute/ROCR-Runtime/tree/memory_model_queries ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu: don't enable baco on boco platforms in runpm Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.77 Aric Cyr (1): drm/amd/display: 3.2.147 Bing Guo (2): drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X drm/amd/display: Increase stutter watermark for dcn303 Cai Huoqing (2): drm/amd/display: Fix typo in comments gpu/drm/radeon: Fix typo in comments Candice Li (1): drm/amd/amdgpu: remove redundant host to psp cmd buf allocations Chengming Gui (1): drm/amdgpu: add DID for beige goby Christophe JAILLET (1): drm/amd/pm: Fix a memory leak in an error handling path in 'vangogh_tables_init()' Colin Ian King (1): drm/amd/display: Remove redundant initialization of variable eng_id Dan Carpenter (1): drm/amdgpu: check for allocation failure in amdgpu_vkms_sw_init() Eric Huang (7): Revert "Revert "drm/amdkfd: Add heavy-weight TLB flush after unmapping"" Revert "Revert "drm/amdgpu: Add table_freed parameter to amdgpu_vm_bo_update"" Revert "Revert "drm/amdkfd: Make TLB flush conditional on mapping"" Revert "Revert "drm/amdgpu: Fix warning of Function parameter or member not described"" Revert "Revert "drm/amdkfd: Add memory sync before TLB flush on unmap"" Revert "Revert "drm/amdkfd: Only apply TLB flush optimization on ALdebaran"" drm/amdkfd: Only apply heavy-weight TLB flush on Aldebaran Felix Kuehling (1): drm/amdkfd: Allow querying SVM attributes that are clear Graham Sider (1): drm/amdkfd: Expose GFXIP engine version to sysfs Guchun Chen (1): drm/amdgpu: avoid over-handle of fence driver fini in s3 test (v2) Jaehyun Chung (1): drm/amd/display: Add check for validating unsupported ODM plus MPO case John Clements (3): drm/amdgpu: update PSP BL cmd IDs drm/amdgpu: added synchronization for psp cmd buf access drm/amdgpu: set RAS EEPROM address from VBIOS Joseph Greathouse (1): drm/amdgpu: Put MODE register in wave debug info Jude Shih (1): drm/amd/display: Fix resetting DCN3.1 HW when resuming from S4 Kenneth Feng (1): drm/amd/pm: bug fix for the runtime pm BACO Kevin Wang (1): drm/amd/pm: correct aldebaran smu feature mapping FEATURE_DATA_CALCULATIONS Masanari Iida (1): drm/amdgpu/powerplay/smu10: Fix a typo in error message Mukul Joshi (1): drm/amdgpu: Fix channel_index table layout for Aldebaran Peng Ju Zhou (1): drm/amd/amdgpu: Recovery vcn instance iterate. Qingqing Zhuo (1): drm/amd/display: workaround for hard hang on HPD on native DP Randy Dunlap (1): drm/amdgpu: fix checking pmops when PM_SLEEP is not enabled Rodrigo Siqueira (4): drm/amd/display: Move specific DCN2x code that uses FPU to DML drm/amd/display: Add control mechanism for FPU drm/amd/display: Add control mechanism for FPU utilization drm/amd/display: Add DC_FP helper to check FPU state Roman Li (1): drm/amd/display: Remove redundant vblank workqueues in DM Ryan Taylor (3): drm/amdgpu: create amdgpu_vkms (v4) drm/amdgpu: cleanup dce_virtual drm/amdgpu: replace dce_virtual with amdgpu_vkms (v3) Sergio Miguéns Iglesias (1): DRM: gpu: radeon: Fixed coding style issues Shirish S (1): drm/amdgpu/display: fix DMUB firmware version info Solomon Chiu (1): drm/amdgpu: Add preferred mode in modeset when freesync video mode's enabled. Tom St Denis (1): drm/amd/amdgpu: add regCP_MEx_INT_STAT_DEBUG for Aldebaran debugging Tuo Li (1): drm/amdgpu: drop redundant null-pointer checks in amdgpu_ttm_tt_populate() and amdgpu_ttm_tt_unpopulate() Wesley Chalmers (1): drm/amd/display: Assume LTTPR interop for DCN31+ Xiaomeng Hou (2): drm/amd/pm: update yellow carp pmfw interface version drm/amd/pm: update smu v13.0.1 firmware header Yifan Zhang (1): drm/amdgpu: fix the doorbell missing when in CGPG issue for renoir. Zhenneng Li (1): drm/radeon: Update pitch for page flip xinhui pan (1): drm/amdgpu: Fix out-of-bounds read when update mapping zhouchuangao (1): gpu/drm/amd: Remove duplicated include of drm_drv.h drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 25 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 40 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 272 ++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 17 + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 643 +++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h | 26 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- drivers/gpu/drm/amd/amdgpu/cik.c | 10 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 780 --------------------- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 22 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/nv.c | 22 +- drivers/gpu/drm/amd/amdgpu/si.c | 8 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 16 +- drivers/gpu/drm/amd/amdgpu/umc_v6_7.h | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 33 +- drivers/gpu/drm/amd/amdgpu/vi.c | 14 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 47 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 29 + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 19 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 17 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 24 + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 144 ++++ drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.h | 34 + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 21 +- .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 7 +- drivers/gpu/drm/amd/display/dc/dc.h | 4 +- drivers/gpu/drm/amd/display/dc/dc_trace.h | 3 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 2 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 41 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 2 - .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 20 + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 4 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 16 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 2 +- .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 2 +- .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 2 +- drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.c | 102 +++ .../dce_virtual.h => display/dc/dml/dcn2x/dcn2x.h} | 16 +- .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 2 +- .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 2 +- .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 4 +- drivers/gpu/drm/amd/display/dc/os_types.h | 35 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 4 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 8 +- .../drm/amd/include/asic_reg/gc/gc_9_4_2_offset.h | 4 + .../drm/amd/include/asic_reg/gc/gc_9_4_2_sh_mask.h | 54 ++ drivers/gpu/drm/amd/include/atomfirmware.h | 2 +- drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 2 +- drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h | 4 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 2 +- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 3 +- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 2 +- drivers/gpu/drm/radeon/atombios.h | 4 +- drivers/gpu/drm/radeon/evergreen.c | 8 +- drivers/gpu/drm/radeon/r100.c | 9 + drivers/gpu/drm/radeon/r300_reg.h | 2 +- drivers/gpu/drm/radeon/radeon_device.c | 2 +- drivers/gpu/drm/radeon/radeon_fb.c | 7 +- drivers/gpu/drm/radeon/radeon_fence.c | 2 +- drivers/gpu/drm/radeon/radeon_vm.c | 2 +- drivers/gpu/drm/radeon/rs600.c | 8 +- drivers/gpu/drm/radeon/rv770.c | 8 +- include/uapi/linux/kfd_ioctl.h | 16 +- 96 files changed, 1611 insertions(+), 1196 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.h delete mode 100644 drivers/gpu/drm/amd/amdgpu/dce_virtual.c create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn2x/dcn2x.c rename drivers/gpu/drm/amd/{amdgpu/dce_virtual.h => display/dc/dml/dcn2x/dcn2x.h} (77%)
