aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 098dd1ba751a..5d7d7900ccab 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -387,7 +387,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
ats_entries = 0;
}
- ring = container_of(vm->entity.sched, struct amdgpu_ring, sched);
+ ring = container_of(vm->entity.rq->sched, struct amdgpu_ring, sched);
r = reservation_object_reserve_shared(bo->tbo.resv);
if (r)
@@ -1113,7 +1113,7 @@ restart:
struct amdgpu_ring *ring;
struct dma_fence *fence;
- ring = container_of(vm->entity.sched, struct amdgpu_ring,
+ ring = container_of(vm->entity.rq->sched, struct amdgpu_ring,
sched);
amdgpu_ring_pad_ib(ring, params.ib);
@@ -1403,7 +1403,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
addr, flags);
}
- ring = container_of(vm->entity.sched, struct amdgpu_ring, sched);
+ ring = container_of(vm->entity.rq->sched, struct amdgpu_ring, sched);
nptes = last - start + 1;
@@ -2642,7 +2642,7 @@ error_free_root:
vm->root.base.bo = NULL;
error_free_sched_entity:
- drm_sched_entity_destroy(&ring->sched, &vm->entity);
+ drm_sched_entity_destroy(&vm->entity);
return r;
}
@@ -2779,7 +2779,7 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags);
}
- drm_sched_entity_destroy(vm->entity.sched, &vm->entity);
+ drm_sched_entity_destroy(&vm->entity);
if (!RB_EMPTY_ROOT(&vm->va.rb_root)) {
dev_err(adev->dev, "still active bo inside vm\n");
orktree unavailableEmily Shaffer3-4/+50 2020-03-15l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)Yi-Jyun1-388/+289 2020-03-15l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)Yi-Jyun1-2604/+2823 2020-03-14git-gui--askpass: coerce answers to UTF-8 on WindowsLuke Bonanomi1-0/+5 2020-03-13t6022, t6046: fix flaky files-are-updated checksElijah Newren2-23/+17 2020-03-12Hopefully the final batch before -rc2Junio C Hamano1-0/+21 2020-03-12fsck: detect gitmodules URLs with embedded newlinesJeff King2-2/+32 2020-03-12credential: detect unrepresentable values when parsing urlsJeff King3-4/+60 2020-03-12t/lib-credential: use test_i18ncmp to check stderrJeff King1-1/+1 2020-03-12credential: avoid writing values with newlinesJeff King2-0/+8 2020-03-12l10n: it.po: update the Italian translation for Git 2.26.0 round 2Alessandro Menti1-267/+297 2020-03-11l10n: es: 2.26.0 round#2Christopher Diaz Riveros1-2550/+2979 2020-03-12l10n: bg.po: Updated Bulgarian translation (4839t)Alexander Shopov1-242/+270 2020-03-12l10n: tr: v2.26.0 round 2Emir Sarı1-262/+284 2020-03-11l10n: fr : v2.26.0 rnd 2Jean-Noël Avila1-353/+308 2020-03-11git-rebase.txt: highlight backend differences with commit rewordingElijah Newren1-0/+10 2020-03-11sequencer: clear state upon dropping a become-empty commitElijah Newren2-0/+10 2020-03-11i18n: unmark a message in rebase.cJiang Xin1-1/+1 2020-03-11l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)Jiang Xin1-238/+260 2020-03-10l10n: tr: Add glossary for Turkish translationsEmir Sarı1-4/+87 2020-03-09l10n: sv.po: Update Swedish translation (4835t0f0u)Peter Krefting1-2379/+2764