On 11/13/25 17:05, Pierre-Eric Pelloux-Prayer wrote: > This will allow the use of all of them for clear/fill buffer > operations. > Since drm_sched_entity_init requires a scheduler array, we > store schedulers rather than rings. For the few places that need > access to a ring, we can get it from the sched using container_of. > > Since the code is the same for all sdma versions, add a new > helper amdgpu_sdma_set_buffer_funcs_scheds to set buffer_funcs_scheds > based on the number of sdma instances. > > Note: the new sched array is identical to the amdgpu_vm_manager one. > These 2 could be merged.
I realized a bit after we discussed it that this isn't true. We need the two arrays separated for a Navi 1x workaround to work correctly. Anyway, that doesn't affect reviewing this patch here. > > Signed-off-by: Pierre-Eric Pelloux-Prayer <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + > drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++-- > drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 41 +++++++++++++++---- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 3 +- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 3 +- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 3 +- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 6 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 6 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/si_dma.c | 3 +- > drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- > 17 files changed, 62 insertions(+), 45 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 3fab3dc9f3e4..05c13fb0e6bf 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -1615,6 +1615,8 @@ ssize_t amdgpu_get_soft_full_reset_mask(struct > amdgpu_ring *ring); > ssize_t amdgpu_show_reset_mask(char *buf, uint32_t supported_reset); > void amdgpu_sdma_set_vm_pte_scheds(struct amdgpu_device *adev, > const struct amdgpu_vm_pte_funcs > *vm_pte_funcs); > +void amdgpu_sdma_set_buffer_funcs_scheds(struct amdgpu_device *adev, > + const struct amdgpu_buffer_funcs > *buffer_funcs); > > /* atpx handler */ > #if defined(CONFIG_VGA_SWITCHEROO) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c > index b59040a8771f..9ea927e07a77 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c > @@ -32,12 +32,14 @@ static int amdgpu_benchmark_do_move(struct amdgpu_device > *adev, unsigned size, > uint64_t saddr, uint64_t daddr, int n, s64 > *time_ms) > { > ktime_t stime, etime; > + struct amdgpu_ring *ring; > struct dma_fence *fence; > int i, r; > > + ring = container_of(adev->mman.buffer_funcs_scheds[0], struct > amdgpu_ring, sched); We have the to_amdgpu_ring() macro for that. > + > stime = ktime_get(); > for (i = 0; i < n; i++) { > - struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring; > r = amdgpu_copy_buffer(ring, &adev->mman.default_entity.base, > saddr, daddr, size, NULL, &fence, > false, 0); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index b92234d63562..1927d940fbca 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -3303,7 +3303,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device > *adev) > if (r) > goto init_failed; > > - if (adev->mman.buffer_funcs_ring->sched.ready) > + if (adev->mman.buffer_funcs_scheds[0]->ready) > amdgpu_ttm_set_buffer_funcs_status(adev, true); > > /* Don't init kfd if whole hive need to be reset during init */ > @@ -4143,7 +4143,7 @@ static int amdgpu_device_ip_resume(struct amdgpu_device > *adev) > > r = amdgpu_device_ip_resume_phase2(adev); > > - if (adev->mman.buffer_funcs_ring->sched.ready) > + if (adev->mman.buffer_funcs_scheds[0]->ready) We should probably drop that check here and move this into amdgpu_ttm_set_buffer_funcs_status(). > amdgpu_ttm_set_buffer_funcs_status(adev, true); > > if (r) > @@ -4493,7 +4493,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, > adev->num_rings = 0; > RCU_INIT_POINTER(adev->gang_submit, dma_fence_get_stub()); > adev->mman.buffer_funcs = NULL; > - adev->mman.buffer_funcs_ring = NULL; > + adev->mman.num_buffer_funcs_scheds = 0; > adev->vm_manager.vm_pte_funcs = NULL; > adev->vm_manager.vm_pte_num_scheds = 0; > adev->gmc.gmc_funcs = NULL; > @@ -5965,7 +5965,7 @@ int amdgpu_device_reinit_after_reset(struct > amdgpu_reset_context *reset_context) > if (r) > goto out; > > - if > (tmp_adev->mman.buffer_funcs_ring->sched.ready) > + if > (tmp_adev->mman.buffer_funcs_scheds[0]->ready) > > amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true); > > r = amdgpu_device_ip_resume_phase3(tmp_adev); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c > index 2713dd51ab9a..4433d8620129 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c > @@ -651,12 +651,14 @@ int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device > *adev) > void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, > uint32_t vmhub, uint32_t flush_type) > { > - struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring; > + struct amdgpu_ring *ring; > struct amdgpu_vmhub *hub = &adev->vmhub[vmhub]; > struct dma_fence *fence; > struct amdgpu_job *job; > int r, i; > > + ring = container_of(adev->mman.buffer_funcs_scheds[0], struct > amdgpu_ring, sched); > + > if (!hub->sdma_invalidation_workaround || vmid || > !adev->mman.buffer_funcs_enabled || !adev->ib_pool_ready || > !ring->sched.ready) { > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 6c333dba7a35..11fec0fa4c11 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -308,7 +308,7 @@ static int amdgpu_ttm_copy_mem_to_mem(struct > amdgpu_device *adev, > struct dma_resv *resv, > struct dma_fence **f) > { > - struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring; > + struct amdgpu_ring *ring; > struct amdgpu_res_cursor src_mm, dst_mm; > struct dma_fence *fence = NULL; > int r = 0; > @@ -321,6 +321,8 @@ static int amdgpu_ttm_copy_mem_to_mem(struct > amdgpu_device *adev, > return -EINVAL; > } > > + ring = container_of(adev->mman.buffer_funcs_scheds[0], struct > amdgpu_ring, sched); > + > amdgpu_res_first(src->mem, src->offset, size, &src_mm); > amdgpu_res_first(dst->mem, dst->offset, size, &dst_mm); > > @@ -1493,6 +1495,7 @@ static int amdgpu_ttm_access_memory_sdma(struct > ttm_buffer_object *bo, > struct amdgpu_bo *abo = ttm_to_amdgpu_bo(bo); > struct amdgpu_device *adev = amdgpu_ttm_adev(abo->tbo.bdev); > struct amdgpu_res_cursor src_mm; > + struct amdgpu_ring *ring; > struct amdgpu_job *job; > struct dma_fence *fence; > uint64_t src_addr, dst_addr; > @@ -1530,7 +1533,8 @@ static int amdgpu_ttm_access_memory_sdma(struct > ttm_buffer_object *bo, > amdgpu_emit_copy_buffer(adev, &job->ibs[0], src_addr, dst_addr, > PAGE_SIZE, 0); > > - amdgpu_ring_pad_ib(adev->mman.buffer_funcs_ring, &job->ibs[0]); > + ring = container_of(adev->mman.buffer_funcs_scheds[0], struct > amdgpu_ring, sched); > + amdgpu_ring_pad_ib(ring, &job->ibs[0]); > WARN_ON(job->ibs[0].length_dw > num_dw); > > fence = amdgpu_job_submit(job); > @@ -2196,11 +2200,9 @@ u32 amdgpu_ttm_set_buffer_funcs_status(struct > amdgpu_device *adev, bool enable) > return windows; > > if (enable) { > - struct amdgpu_ring *ring; > struct drm_gpu_scheduler *sched; > > - ring = adev->mman.buffer_funcs_ring; > - sched = &ring->sched; > + sched = adev->mman.buffer_funcs_scheds[0]; > r = drm_sched_entity_init(&adev->mman.default_entity.base, > DRM_SCHED_PRIORITY_KERNEL, &sched, > 1, NULL); > @@ -2432,7 +2434,7 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, > struct dma_fence **fence) > { > struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); > - struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring; > + struct amdgpu_ring *ring; > struct amdgpu_ttm_buffer_entity *entity; > struct amdgpu_res_cursor cursor; > u64 addr; > @@ -2443,6 +2445,8 @@ int amdgpu_ttm_clear_buffer(struct amdgpu_bo *bo, > > if (!fence) > return -EINVAL; > + > + ring = container_of(adev->mman.buffer_funcs_scheds[0], struct > amdgpu_ring, sched); > entity = &adev->mman.clear_entities[0]; > *fence = dma_fence_get_stub(); > > @@ -2494,9 +2498,9 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity > *entity, > u64 k_job_id) > { > struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); > - struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring; > struct dma_fence *fence = NULL; > struct amdgpu_res_cursor dst; > + struct amdgpu_ring *ring; > int r, e; > > if (!adev->mman.buffer_funcs_enabled) { > @@ -2505,6 +2509,8 @@ int amdgpu_fill_buffer(struct amdgpu_ttm_buffer_entity > *entity, > return -EINVAL; > } > > + ring = container_of(adev->mman.buffer_funcs_scheds[0], struct > amdgpu_ring, sched); > + > if (entity == NULL) { > e = atomic_inc_return(&adev->mman.next_clear_entity) % > adev->mman.num_clear_entities; > @@ -2579,6 +2585,27 @@ int amdgpu_ttm_evict_resources(struct amdgpu_device > *adev, int mem_type) > return ttm_resource_manager_evict_all(&adev->mman.bdev, man); > } > > +void amdgpu_sdma_set_buffer_funcs_scheds(struct amdgpu_device *adev, > + const struct amdgpu_buffer_funcs > *buffer_funcs) > +{ > + struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB(0)]; > + struct drm_gpu_scheduler *sched; > + int i; > + > + adev->mman.buffer_funcs = buffer_funcs; > + > + for (i = 0; i < adev->sdma.num_instances; i++) { > + if (adev->sdma.has_page_queue) > + sched = &adev->sdma.instance[i].page.sched; > + else > + sched = &adev->sdma.instance[i].ring.sched; > + adev->mman.buffer_funcs_scheds[i] = sched; > + } > + > + adev->mman.num_buffer_funcs_scheds = hub->sdma_invalidation_workaround ? > + 1 : adev->sdma.num_instances; > +} > + Probably better to make all SDMA version switch to use amdgpu_sdma_set_buffer_funcs_scheds() one patch and then changing amdgpu_sdma_set_buffer_funcs_scheds() to use more than one DMA engine a second patch. Regards, Christian. > #if defined(CONFIG_DEBUG_FS) > > static int amdgpu_ttm_page_pool_show(struct seq_file *m, void *unused) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h > index 4844f001f590..63c3e2466708 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h > @@ -66,7 +66,8 @@ struct amdgpu_mman { > > /* buffer handling */ > const struct amdgpu_buffer_funcs *buffer_funcs; > - struct amdgpu_ring *buffer_funcs_ring; > + struct drm_gpu_scheduler > *buffer_funcs_scheds[AMDGPU_MAX_RINGS]; > + u32 num_buffer_funcs_scheds; > bool buffer_funcs_enabled; > > struct mutex gtt_window_lock; > diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > index 5fe162f52c92..a36385ad8da8 100644 > --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c > @@ -1333,8 +1333,7 @@ static const struct amdgpu_buffer_funcs > cik_sdma_buffer_funcs = { > > static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev) > { > - adev->mman.buffer_funcs = &cik_sdma_buffer_funcs; > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > + amdgpu_sdma_set_buffer_funcs_scheds(adev, &cik_sdma_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > index 63636643db3d..4a3ba136a36c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c > @@ -1228,8 +1228,7 @@ static const struct amdgpu_buffer_funcs > sdma_v2_4_buffer_funcs = { > > static void sdma_v2_4_set_buffer_funcs(struct amdgpu_device *adev) > { > - adev->mman.buffer_funcs = &sdma_v2_4_buffer_funcs; > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v2_4_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > index 0153626b5df2..3cf527bcadf6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > @@ -1670,8 +1670,7 @@ static const struct amdgpu_buffer_funcs > sdma_v3_0_buffer_funcs = { > > static void sdma_v3_0_set_buffer_funcs(struct amdgpu_device *adev) > { > - adev->mman.buffer_funcs = &sdma_v3_0_buffer_funcs; > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v3_0_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs sdma_v3_0_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > index 96a67b30854c..7e106baecad5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > @@ -2608,11 +2608,7 @@ static const struct amdgpu_buffer_funcs > sdma_v4_0_buffer_funcs = { > > static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev) > { > - adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs; > - if (adev->sdma.has_page_queue) > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].page; > - else > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v4_0_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs sdma_v4_0_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c > index 04dc8a8f4d66..7cb0e213bab2 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c > @@ -2309,11 +2309,7 @@ static const struct amdgpu_buffer_funcs > sdma_v4_4_2_buffer_funcs = { > > static void sdma_v4_4_2_set_buffer_funcs(struct amdgpu_device *adev) > { > - adev->mman.buffer_funcs = &sdma_v4_4_2_buffer_funcs; > - if (adev->sdma.has_page_queue) > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].page; > - else > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v4_4_2_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs sdma_v4_4_2_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c > index 19c717f2c602..eab09c5fc762 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c > @@ -2066,10 +2066,8 @@ static const struct amdgpu_buffer_funcs > sdma_v5_0_buffer_funcs = { > > static void sdma_v5_0_set_buffer_funcs(struct amdgpu_device *adev) > { > - if (adev->mman.buffer_funcs == NULL) { > - adev->mman.buffer_funcs = &sdma_v5_0_buffer_funcs; > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > - } > + if (adev->mman.buffer_funcs == NULL) > + amdgpu_sdma_set_buffer_funcs_scheds(adev, > &sdma_v5_0_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs sdma_v5_0_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c > index 7a07b8f4e86d..e843da1dce59 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c > @@ -2076,10 +2076,8 @@ static const struct amdgpu_buffer_funcs > sdma_v5_2_buffer_funcs = { > > static void sdma_v5_2_set_buffer_funcs(struct amdgpu_device *adev) > { > - if (adev->mman.buffer_funcs == NULL) { > - adev->mman.buffer_funcs = &sdma_v5_2_buffer_funcs; > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > - } > + if (adev->mman.buffer_funcs == NULL) > + amdgpu_sdma_set_buffer_funcs_scheds(adev, > &sdma_v5_2_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs sdma_v5_2_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c > index 8f8228c7adee..d078bff42983 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c > @@ -1884,8 +1884,7 @@ static const struct amdgpu_buffer_funcs > sdma_v6_0_buffer_funcs = { > > static void sdma_v6_0_set_buffer_funcs(struct amdgpu_device *adev) > { > - adev->mman.buffer_funcs = &sdma_v6_0_buffer_funcs; > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v6_0_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs sdma_v6_0_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c > index cf412d8fb0ed..77ad6f128e75 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c > @@ -1826,8 +1826,7 @@ static const struct amdgpu_buffer_funcs > sdma_v7_0_buffer_funcs = { > > static void sdma_v7_0_set_buffer_funcs(struct amdgpu_device *adev) > { > - adev->mman.buffer_funcs = &sdma_v7_0_buffer_funcs; > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > + amdgpu_sdma_set_buffer_funcs_scheds(adev, &sdma_v7_0_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs sdma_v7_0_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c > b/drivers/gpu/drm/amd/amdgpu/si_dma.c > index 863e00086c30..4f6d7eeceb37 100644 > --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c > +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c > @@ -826,8 +826,7 @@ static const struct amdgpu_buffer_funcs > si_dma_buffer_funcs = { > > static void si_dma_set_buffer_funcs(struct amdgpu_device *adev) > { > - adev->mman.buffer_funcs = &si_dma_buffer_funcs; > - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring; > + amdgpu_sdma_set_buffer_funcs_scheds(adev, &si_dma_buffer_funcs); > } > > static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = { > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c > b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c > index 943c3438c7ee..3f7b85aabb72 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c > @@ -129,13 +129,14 @@ svm_migrate_copy_memory_gart(struct amdgpu_device > *adev, dma_addr_t *sys, > struct dma_fence **mfence) > { > const u64 GTT_MAX_PAGES = AMDGPU_GTT_MAX_TRANSFER_SIZE; > - struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring; > + struct amdgpu_ring *ring; > struct amdgpu_ttm_buffer_entity *entity; > u64 gart_s, gart_d; > struct dma_fence *next; > u64 size; > int r; > > + ring = container_of(adev->mman.buffer_funcs_scheds[0], struct > amdgpu_ring, sched); > entity = &adev->mman.move_entities[0]; > > mutex_lock(&entity->gart_window_lock);
