The drm/ttm patch modifies TTM to support multiple contexts for the pipelined
moves.
Then amdgpu/ttm is updated to express dependencies between jobs explicitely,
instead of relying on the ordering of execution guaranteed by the use of a
single
instance.
With all of this in place, we can use multiple entities, with each having access
to the available SDMA instances.
This rework also gives the opportunity to merge the clear functions into a
single
one and to optimize a bit GART usage.
(The first patch of the series has already been merged through drm-misc but I'm
including it here to reduce conflicts)
For v3 I've kept the series as a whole but I've reorganized the patches so that
everything up to the drm/ttm change can be merged through amd-staging-drm-next
once reviewed.
v3:
- shuffled the patches: everything up to the drm/ttm patch has no dependency
on the ttm change and be merged independently
- split "drm/amdgpu: pass the entity to use to ttm functions" in 2 commits
- moved AMDGPU_GTT_NUM_TRANSFER_WINDOWS removal to its own commit
- added a ttm job submission helper
- addressed comments from Christian and Felix
v2:
- addressed comments from Christian
- dropped "drm/amdgpu: prepare amdgpu_fill_buffer to use N entities" and
"drm/amdgpu: use multiple entities in amdgpu_fill_buffer"
- added "drm/admgpu: handle resv dependencies in amdgpu_ttm_map_buffer",
"drm/amdgpu: round robin through clear_entities in amdgpu_fill_buffer"
- reworked how sdma rings/scheds are passed to amdgpu_ttm
v1: https://lists.freedesktop.org/archives/dri-devel/2025-November/534517.html
Pierre-Eric Pelloux-Prayer (28):
drm/amdgpu: give each kernel job a unique id
drm/amdgpu: use ttm_resource_manager_cleanup
drm/amdgpu: remove direct_submit arg from amdgpu_copy_buffer
drm/amdgpu: remove the ring param from ttm functions
drm/amdgpu: introduce amdgpu_ttm_buffer_entity
drm/amdgpu: add amdgpu_ttm_job_submit helper
drm/amdgpu: fix error handling in amdgpu_copy_buffer
drm/amdgpu: pass the entity to use to amdgpu_ttm_map_buffer
drm/amdgpu: pass the entity to use to ttm public functions
drm/amdgpu: add amdgpu_device argument to ttm functions that need it
drm/amdgpu: statically assign gart windows to ttm entities
drm/amdgpu: remove AMDGPU_GTT_NUM_TRANSFER_WINDOWS
drm/amdgpu: add missing lock when using ttm entities
drm/amdgpu: check entity lock is held in amdgpu_ttm_job_submit
drm/amdgpu: double AMDGPU_GTT_MAX_TRANSFER_SIZE
drm/amdgpu: use larger gart window when possible
drm/amdgpu: introduce amdgpu_sdma_set_vm_pte_scheds
drm/amdgpu: move sched status check inside
amdgpu_ttm_set_buffer_funcs_status
drm/ttm: rework pipelined eviction fence handling
drm/amdgpu: allocate multiple clear entities
drm/amdgpu: allocate multiple move entities
drm/amdgpu: round robin through clear_entities in amdgpu_fill_buffer
drm/amdgpu: use TTM_NUM_MOVE_FENCES when reserving fences
drm/amdgpu: use multiple entities in amdgpu_move_blit
drm/amdgpu: pass all the sdma scheds to amdgpu_mman
drm/amdgpu: give ttm entities access to all the sdma scheds
drm/amdgpu: get rid of amdgpu_ttm_clear_buffer
drm/amdgpu: rename amdgpu_fill_buffer as amdgpu_ttm_clear_buffer
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 +
drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 19 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 493 +++++++++++-------
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 58 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 11 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 26 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 12 +-
drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 34 +-
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 34 +-
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 34 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 41 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 41 +-
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 37 +-
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 37 +-
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 32 +-
drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 32 +-
drivers/gpu/drm/amd/amdgpu/si_dma.c | 34 +-
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +-
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 6 +-
drivers/gpu/drm/amd/amdgpu/vce_v1_0.c | 12 +-
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 33 +-
drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3 +-
.../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 6 +-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 6 +-
.../gpu/drm/ttm/tests/ttm_bo_validate_test.c | 11 +-
drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 5 +-
drivers/gpu/drm/ttm/ttm_bo.c | 47 +-
drivers/gpu/drm/ttm/ttm_bo_util.c | 38 +-
drivers/gpu/drm/ttm/ttm_resource.c | 31 +-
include/drm/ttm/ttm_resource.h | 29 +-
47 files changed, 706 insertions(+), 615 deletions(-)
--
2.43.0
