diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index f7eee81d120a..d0acc9c0fd7f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |||
@@ -362,7 +362,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev, | |||
362 | ib->length_dw = 0; | 362 | ib->length_dw = 0; |
363 | 363 | ||
364 | amdgpu_vm_update_pages(adev, NULL, 0, ib, addr, 0, entries, 0, 0); | 364 | amdgpu_vm_update_pages(adev, NULL, 0, ib, addr, 0, entries, 0, 0); |
365 | amdgpu_vm_pad_ib(adev, ib); | 365 | amdgpu_ring_pad_ib(ring, ib); |
366 | 366 | ||
367 | WARN_ON(ib->length_dw > 64); | 367 | WARN_ON(ib->length_dw > 64); |
368 | r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, | 368 | r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, |
@@ -492,7 +492,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, | |||
492 | count, incr, AMDGPU_PTE_VALID); | 492 | count, incr, AMDGPU_PTE_VALID); |
493 | 493 | ||
494 | if (ib->length_dw != 0) { | 494 | if (ib->length_dw != 0) { |
495 | amdgpu_vm_pad_ib(adev, ib); | 495 | amdgpu_ring_pad_ib(ring, ib); |
496 | amdgpu_sync_resv(adev, &ib->sync, pd->tbo.resv, AMDGPU_FENCE_OWNER_VM); | 496 | amdgpu_sync_resv(adev, &ib->sync, pd->tbo.resv, AMDGPU_FENCE_OWNER_VM); |
497 | WARN_ON(ib->length_dw > ndw); | 497 | WARN_ON(ib->length_dw > ndw); |
498 | r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, | 498 | r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, |
@@ -755,7 +755,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, | |||
755 | amdgpu_vm_update_ptes(adev, gtt, gtt_flags, vm, ib, start, last + 1, | 755 | amdgpu_vm_update_ptes(adev, gtt, gtt_flags, vm, ib, start, last + 1, |
756 | addr, flags); | 756 | addr, flags); |
757 | 757 | ||
758 | amdgpu_vm_pad_ib(adev, ib); | 758 | amdgpu_ring_pad_ib(ring, ib); |
759 | WARN_ON(ib->length_dw > ndw); | 759 | WARN_ON(ib->length_dw > ndw); |
760 | r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, | 760 | r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, ib, 1, |
761 | &amdgpu_vm_free_job, | 761 | &amdgpu_vm_free_job, |