On Mon, Feb 2, 2026 at 1:12 PM Christian König <[email protected]> wrote: > > This reverts commit 7e64d0e5979157ee5fc83e58ac61b4a36803c7f1. > > The problems were caused by not holding the VM lock while adding new > BOs.
I think it would be clearer to restate the original commit message as this just reverts a partial revert of a revert and the original goal of the change is hard to sort out without digging through the commit history. E.g., from the original change: Re-add a separate stats_lock and lockdep assertions that the correct reservation lock is held all over the place. This not only allows for better checks if a state transition is properly protected by a lock, but also switching back to using list macros to iterate over the state of lists protected by the dma_resv lock of the root PD. With that cleaned up, Reviewed-by: Alex Deucher <[email protected]> > > Signed-off-by: Christian König <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 8 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 146 ++++++++-------------- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 15 ++- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 4 - > 4 files changed, 68 insertions(+), 105 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c > index b700c2b91465..8feeaeea1c36 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c > @@ -1058,12 +1058,12 @@ amdgpu_userq_bo_validate(struct amdgpu_device *adev, > struct drm_exec *exec, > struct amdgpu_bo *bo; > int ret; > > - spin_lock(&vm->status_lock); > + spin_lock(&vm->invalidated_lock); > while (!list_empty(&vm->invalidated)) { > bo_va = list_first_entry(&vm->invalidated, > struct amdgpu_bo_va, > base.vm_status); > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->invalidated_lock); > > bo = bo_va->base.bo; > ret = drm_exec_prepare_obj(exec, &bo->tbo.base, 2); > @@ -1080,9 +1080,9 @@ amdgpu_userq_bo_validate(struct amdgpu_device *adev, > struct drm_exec *exec, > if (ret) > return ret; > > - spin_lock(&vm->status_lock); > + spin_lock(&vm->invalidated_lock); > } > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->invalidated_lock); > > return 0; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > index b4bf1b7c214f..a8a4fffc5764 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > @@ -153,12 +153,10 @@ static void amdgpu_vm_bo_evicted(struct > amdgpu_vm_bo_base *vm_bo) > > vm_bo->moved = true; > amdgpu_vm_assert_locked(vm); > - spin_lock(&vm_bo->vm->status_lock); > if (bo->tbo.type == ttm_bo_type_kernel) > list_move(&vm_bo->vm_status, &vm->evicted); > else > list_move_tail(&vm_bo->vm_status, &vm->evicted); > - spin_unlock(&vm_bo->vm->status_lock); > } > /** > * amdgpu_vm_bo_moved - vm_bo is moved > @@ -171,9 +169,7 @@ static void amdgpu_vm_bo_evicted(struct amdgpu_vm_bo_base > *vm_bo) > static void amdgpu_vm_bo_moved(struct amdgpu_vm_bo_base *vm_bo) > { > amdgpu_vm_assert_locked(vm_bo->vm); > - spin_lock(&vm_bo->vm->status_lock); > list_move(&vm_bo->vm_status, &vm_bo->vm->moved); > - spin_unlock(&vm_bo->vm->status_lock); > } > > /** > @@ -187,9 +183,7 @@ static void amdgpu_vm_bo_moved(struct amdgpu_vm_bo_base > *vm_bo) > static void amdgpu_vm_bo_idle(struct amdgpu_vm_bo_base *vm_bo) > { > amdgpu_vm_assert_locked(vm_bo->vm); > - spin_lock(&vm_bo->vm->status_lock); > list_move(&vm_bo->vm_status, &vm_bo->vm->idle); > - spin_unlock(&vm_bo->vm->status_lock); > vm_bo->moved = false; > } > > @@ -203,9 +197,9 @@ static void amdgpu_vm_bo_idle(struct amdgpu_vm_bo_base > *vm_bo) > */ > static void amdgpu_vm_bo_invalidated(struct amdgpu_vm_bo_base *vm_bo) > { > - spin_lock(&vm_bo->vm->status_lock); > + spin_lock(&vm_bo->vm->invalidated_lock); > list_move(&vm_bo->vm_status, &vm_bo->vm->invalidated); > - spin_unlock(&vm_bo->vm->status_lock); > + spin_unlock(&vm_bo->vm->invalidated_lock); > } > > /** > @@ -218,10 +212,9 @@ static void amdgpu_vm_bo_invalidated(struct > amdgpu_vm_bo_base *vm_bo) > */ > static void amdgpu_vm_bo_evicted_user(struct amdgpu_vm_bo_base *vm_bo) > { > + amdgpu_vm_assert_locked(vm_bo->vm); > vm_bo->moved = true; > - spin_lock(&vm_bo->vm->status_lock); > list_move(&vm_bo->vm_status, &vm_bo->vm->evicted_user); > - spin_unlock(&vm_bo->vm->status_lock); > } > > /** > @@ -235,13 +228,10 @@ static void amdgpu_vm_bo_evicted_user(struct > amdgpu_vm_bo_base *vm_bo) > static void amdgpu_vm_bo_relocated(struct amdgpu_vm_bo_base *vm_bo) > { > amdgpu_vm_assert_locked(vm_bo->vm); > - if (vm_bo->bo->parent) { > - spin_lock(&vm_bo->vm->status_lock); > + if (vm_bo->bo->parent) > list_move(&vm_bo->vm_status, &vm_bo->vm->relocated); > - spin_unlock(&vm_bo->vm->status_lock); > - } else { > + else > amdgpu_vm_bo_idle(vm_bo); > - } > } > > /** > @@ -255,9 +245,7 @@ static void amdgpu_vm_bo_relocated(struct > amdgpu_vm_bo_base *vm_bo) > static void amdgpu_vm_bo_done(struct amdgpu_vm_bo_base *vm_bo) > { > amdgpu_vm_assert_locked(vm_bo->vm); > - spin_lock(&vm_bo->vm->status_lock); > list_move(&vm_bo->vm_status, &vm_bo->vm->done); > - spin_unlock(&vm_bo->vm->status_lock); > } > > /** > @@ -271,13 +259,13 @@ static void amdgpu_vm_bo_reset_state_machine(struct > amdgpu_vm *vm) > { > struct amdgpu_vm_bo_base *vm_bo, *tmp; > > - amdgpu_vm_assert_locked(vm); > - > - spin_lock(&vm->status_lock); > + spin_lock(&vm->invalidated_lock); > list_splice_init(&vm->done, &vm->invalidated); > list_for_each_entry(vm_bo, &vm->invalidated, vm_status) > vm_bo->moved = true; > + spin_unlock(&vm->invalidated_lock); > > + amdgpu_vm_assert_locked(vm); > list_for_each_entry_safe(vm_bo, tmp, &vm->idle, vm_status) { > struct amdgpu_bo *bo = vm_bo->bo; > > @@ -287,14 +275,13 @@ static void amdgpu_vm_bo_reset_state_machine(struct > amdgpu_vm *vm) > else if (bo->parent) > list_move(&vm_bo->vm_status, &vm_bo->vm->relocated); > } > - spin_unlock(&vm->status_lock); > } > > /** > * amdgpu_vm_update_shared - helper to update shared memory stat > * @base: base structure for tracking BO usage in a VM > * > - * Takes the vm status_lock and updates the shared memory stat. If the basic > + * Takes the vm stats_lock and updates the shared memory stat. If the basic > * stat changed (e.g. buffer was moved) amdgpu_vm_update_stats need to be > called > * as well. > */ > @@ -307,7 +294,7 @@ static void amdgpu_vm_update_shared(struct > amdgpu_vm_bo_base *base) > bool shared; > > dma_resv_assert_held(bo->tbo.base.resv); > - spin_lock(&vm->status_lock); > + spin_lock(&vm->stats_lock); > shared = drm_gem_object_is_shared_for_memory_stats(&bo->tbo.base); > if (base->shared != shared) { > base->shared = shared; > @@ -319,7 +306,7 @@ static void amdgpu_vm_update_shared(struct > amdgpu_vm_bo_base *base) > vm->stats[bo_memtype].drm.private += size; > } > } > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->stats_lock); > } > > /** > @@ -344,11 +331,11 @@ void amdgpu_vm_bo_update_shared(struct amdgpu_bo *bo) > * be bo->tbo.resource > * @sign: if we should add (+1) or subtract (-1) from the stat > * > - * Caller need to have the vm status_lock held. Useful for when multiple > update > + * Caller need to have the vm stats_lock held. Useful for when multiple > update > * need to happen at the same time. > */ > static void amdgpu_vm_update_stats_locked(struct amdgpu_vm_bo_base *base, > - struct ttm_resource *res, int sign) > + struct ttm_resource *res, int sign) > { > struct amdgpu_vm *vm = base->vm; > struct amdgpu_bo *bo = base->bo; > @@ -372,7 +359,8 @@ static void amdgpu_vm_update_stats_locked(struct > amdgpu_vm_bo_base *base, > */ > if (bo->flags & AMDGPU_GEM_CREATE_DISCARDABLE) > vm->stats[res_memtype].drm.purgeable += size; > - if (!(bo->preferred_domains & > amdgpu_mem_type_to_domain(res_memtype))) > + if (!(bo->preferred_domains & > + amdgpu_mem_type_to_domain(res_memtype))) > vm->stats[bo_memtype].evicted += size; > } > } > @@ -391,9 +379,9 @@ void amdgpu_vm_update_stats(struct amdgpu_vm_bo_base > *base, > { > struct amdgpu_vm *vm = base->vm; > > - spin_lock(&vm->status_lock); > + spin_lock(&vm->stats_lock); > amdgpu_vm_update_stats_locked(base, res, sign); > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->stats_lock); > } > > /** > @@ -419,10 +407,10 @@ void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base > *base, > base->next = bo->vm_bo; > bo->vm_bo = base; > > - spin_lock(&vm->status_lock); > + spin_lock(&vm->stats_lock); > base->shared = > drm_gem_object_is_shared_for_memory_stats(&bo->tbo.base); > amdgpu_vm_update_stats_locked(base, bo->tbo.resource, +1); > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->stats_lock); > > if (!amdgpu_vm_is_bo_always_valid(vm, bo)) > return; > @@ -481,25 +469,25 @@ int amdgpu_vm_lock_done_list(struct amdgpu_vm *vm, > struct drm_exec *exec, > int ret; > > /* We can only trust prev->next while holding the lock */ > - spin_lock(&vm->status_lock); > + spin_lock(&vm->invalidated_lock); > while (!list_is_head(prev->next, &vm->done)) { > bo_va = list_entry(prev->next, typeof(*bo_va), > base.vm_status); > > bo = bo_va->base.bo; > if (bo) { > amdgpu_bo_ref(bo); > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->invalidated_lock); > > ret = drm_exec_prepare_obj(exec, &bo->tbo.base, 1); > amdgpu_bo_unref(&bo); > if (unlikely(ret)) > return ret; > > - spin_lock(&vm->status_lock); > + spin_lock(&vm->invalidated_lock); > } > prev = prev->next; > } > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->invalidated_lock); > > return 0; > } > @@ -595,7 +583,7 @@ int amdgpu_vm_validate(struct amdgpu_device *adev, struct > amdgpu_vm *vm, > void *param) > { > uint64_t new_vm_generation = amdgpu_vm_generation(adev, vm); > - struct amdgpu_vm_bo_base *bo_base; > + struct amdgpu_vm_bo_base *bo_base, *tmp; > struct amdgpu_bo *bo; > int r; > > @@ -608,13 +596,7 @@ int amdgpu_vm_validate(struct amdgpu_device *adev, > struct amdgpu_vm *vm, > return r; > } > > - spin_lock(&vm->status_lock); > - while (!list_empty(&vm->evicted)) { > - bo_base = list_first_entry(&vm->evicted, > - struct amdgpu_vm_bo_base, > - vm_status); > - spin_unlock(&vm->status_lock); > - > + list_for_each_entry_safe(bo_base, tmp, &vm->evicted, vm_status) { > bo = bo_base->bo; > > r = validate(param, bo); > @@ -627,26 +609,21 @@ int amdgpu_vm_validate(struct amdgpu_device *adev, > struct amdgpu_vm *vm, > vm->update_funcs->map_table(to_amdgpu_bo_vm(bo)); > amdgpu_vm_bo_relocated(bo_base); > } > - spin_lock(&vm->status_lock); > } > - while (ticket && !list_empty(&vm->evicted_user)) { > - bo_base = list_first_entry(&vm->evicted_user, > - struct amdgpu_vm_bo_base, > - vm_status); > - spin_unlock(&vm->status_lock); > > - bo = bo_base->bo; > - dma_resv_assert_held(bo->tbo.base.resv); > + if (ticket) { > + list_for_each_entry_safe(bo_base, tmp, &vm->evicted_user, > + vm_status) { > + bo = bo_base->bo; > + dma_resv_assert_held(bo->tbo.base.resv); > > - r = validate(param, bo); > - if (r) > - return r; > - > - amdgpu_vm_bo_invalidated(bo_base); > + r = validate(param, bo); > + if (r) > + return r; > > - spin_lock(&vm->status_lock); > + amdgpu_vm_bo_invalidated(bo_base); > + } > } > - spin_unlock(&vm->status_lock); > > amdgpu_vm_eviction_lock(vm); > vm->evicting = false; > @@ -675,9 +652,7 @@ bool amdgpu_vm_ready(struct amdgpu_vm *vm) > ret = !vm->evicting; > amdgpu_vm_eviction_unlock(vm); > > - spin_lock(&vm->status_lock); > ret &= list_empty(&vm->evicted); > - spin_unlock(&vm->status_lock); > > spin_lock(&vm->immediate.lock); > ret &= !vm->immediate.stopped; > @@ -967,18 +942,13 @@ int amdgpu_vm_update_pdes(struct amdgpu_device *adev, > struct amdgpu_vm *vm, bool immediate) > { > struct amdgpu_vm_update_params params; > - struct amdgpu_vm_bo_base *entry; > + struct amdgpu_vm_bo_base *entry, *tmp; > bool flush_tlb_needed = false; > - LIST_HEAD(relocated); > int r, idx; > > amdgpu_vm_assert_locked(vm); > > - spin_lock(&vm->status_lock); > - list_splice_init(&vm->relocated, &relocated); > - spin_unlock(&vm->status_lock); > - > - if (list_empty(&relocated)) > + if (list_empty(&vm->relocated)) > return 0; > > if (!drm_dev_enter(adev_to_drm(adev), &idx)) > @@ -994,7 +964,7 @@ int amdgpu_vm_update_pdes(struct amdgpu_device *adev, > if (r) > goto error; > > - list_for_each_entry(entry, &relocated, vm_status) { > + list_for_each_entry(entry, &vm->relocated, vm_status) { > /* vm_flush_needed after updating moved PDEs */ > flush_tlb_needed |= entry->moved; > > @@ -1010,9 +980,7 @@ int amdgpu_vm_update_pdes(struct amdgpu_device *adev, > if (flush_tlb_needed) > atomic64_inc(&vm->tlb_seq); > > - while (!list_empty(&relocated)) { > - entry = list_first_entry(&relocated, struct amdgpu_vm_bo_base, > - vm_status); > + list_for_each_entry_safe(entry, tmp, &vm->relocated, vm_status) { > amdgpu_vm_bo_idle(entry); > } > > @@ -1239,9 +1207,9 @@ int amdgpu_vm_update_range(struct amdgpu_device *adev, > struct amdgpu_vm *vm, > void amdgpu_vm_get_memory(struct amdgpu_vm *vm, > struct amdgpu_mem_stats stats[__AMDGPU_PL_NUM]) > { > - spin_lock(&vm->status_lock); > + spin_lock(&vm->stats_lock); > memcpy(stats, vm->stats, sizeof(*stats) * __AMDGPU_PL_NUM); > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->stats_lock); > } > > /** > @@ -1608,29 +1576,24 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev, > struct amdgpu_vm *vm, > struct ww_acquire_ctx *ticket) > { > - struct amdgpu_bo_va *bo_va; > + struct amdgpu_bo_va *bo_va, *tmp; > struct dma_resv *resv; > bool clear, unlock; > int r; > > - spin_lock(&vm->status_lock); > - while (!list_empty(&vm->moved)) { > - bo_va = list_first_entry(&vm->moved, struct amdgpu_bo_va, > - base.vm_status); > - spin_unlock(&vm->status_lock); > - > + list_for_each_entry_safe(bo_va, tmp, &vm->moved, base.vm_status) { > /* Per VM BOs never need to bo cleared in the page tables */ > r = amdgpu_vm_bo_update(adev, bo_va, false); > if (r) > return r; > - spin_lock(&vm->status_lock); > } > > + spin_lock(&vm->invalidated_lock); > while (!list_empty(&vm->invalidated)) { > bo_va = list_first_entry(&vm->invalidated, struct > amdgpu_bo_va, > base.vm_status); > resv = bo_va->base.bo->tbo.base.resv; > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->invalidated_lock); > > /* Try to reserve the BO to avoid clearing its ptes */ > if (!adev->debug_vm && dma_resv_trylock(resv)) { > @@ -1662,9 +1625,9 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev, > bo_va->base.bo->tbo.resource->mem_type == TTM_PL_SYSTEM)) > amdgpu_vm_bo_evicted_user(&bo_va->base); > > - spin_lock(&vm->status_lock); > + spin_lock(&vm->invalidated_lock); > } > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->invalidated_lock); > > return 0; > } > @@ -2207,9 +2170,9 @@ void amdgpu_vm_bo_del(struct amdgpu_device *adev, > } > } > > - spin_lock(&vm->status_lock); > + spin_lock(&vm->invalidated_lock); > list_del(&bo_va->base.vm_status); > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->invalidated_lock); > > list_for_each_entry_safe(mapping, next, &bo_va->valids, list) { > list_del(&mapping->list); > @@ -2317,10 +2280,10 @@ void amdgpu_vm_bo_move(struct amdgpu_bo *bo, struct > ttm_resource *new_mem, > for (bo_base = bo->vm_bo; bo_base; bo_base = bo_base->next) { > struct amdgpu_vm *vm = bo_base->vm; > > - spin_lock(&vm->status_lock); > + spin_lock(&vm->stats_lock); > amdgpu_vm_update_stats_locked(bo_base, bo->tbo.resource, -1); > amdgpu_vm_update_stats_locked(bo_base, new_mem, +1); > - spin_unlock(&vm->status_lock); > + spin_unlock(&vm->stats_lock); > } > > amdgpu_vm_bo_invalidate(bo, evicted); > @@ -2608,11 +2571,12 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct > amdgpu_vm *vm, > INIT_LIST_HEAD(&vm->relocated); > INIT_LIST_HEAD(&vm->moved); > INIT_LIST_HEAD(&vm->idle); > + spin_lock_init(&vm->invalidated_lock); > INIT_LIST_HEAD(&vm->invalidated); > - spin_lock_init(&vm->status_lock); > INIT_LIST_HEAD(&vm->freed); > INIT_LIST_HEAD(&vm->done); > INIT_KFIFO(vm->faults); > + spin_lock_init(&vm->stats_lock); > > r = amdgpu_vm_init_entities(adev, vm); > if (r) > @@ -3080,7 +3044,6 @@ void amdgpu_debugfs_vm_bo_info(struct amdgpu_vm *vm, > struct seq_file *m) > > amdgpu_vm_assert_locked(vm); > > - spin_lock(&vm->status_lock); > seq_puts(m, "\tIdle BOs:\n"); > list_for_each_entry_safe(bo_va, tmp, &vm->idle, base.vm_status) { > if (!bo_va->base.bo) > @@ -3118,11 +3081,13 @@ void amdgpu_debugfs_vm_bo_info(struct amdgpu_vm *vm, > struct seq_file *m) > id = 0; > > seq_puts(m, "\tInvalidated BOs:\n"); > + spin_lock(&vm->invalidated_lock); > list_for_each_entry_safe(bo_va, tmp, &vm->invalidated, > base.vm_status) { > if (!bo_va->base.bo) > continue; > total_invalidated += amdgpu_bo_print_info(id++, > bo_va->base.bo, m); > } > + spin_unlock(&vm->invalidated_lock); > total_invalidated_objs = id; > id = 0; > > @@ -3132,7 +3097,6 @@ void amdgpu_debugfs_vm_bo_info(struct amdgpu_vm *vm, > struct seq_file *m) > continue; > total_done += amdgpu_bo_print_info(id++, bo_va->base.bo, m); > } > - spin_unlock(&vm->status_lock); > total_done_objs = id; > > seq_printf(m, "\tTotal idle size: %12lld\tobjs:\t%d\n", > total_idle, > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > index 139642eacdd0..db9664ec55a9 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > @@ -205,11 +205,11 @@ struct amdgpu_vm_bo_base { > /* protected by bo being reserved */ > struct amdgpu_vm_bo_base *next; > > - /* protected by vm status_lock */ > + /* protected by vm reservation and invalidated_lock */ > struct list_head vm_status; > > /* if the bo is counted as shared in mem stats > - * protected by vm status_lock */ > + * protected by vm BO being reserved */ > bool shared; > > /* protected by the BO being reserved */ > @@ -345,10 +345,8 @@ struct amdgpu_vm { > bool evicting; > unsigned int saved_flags; > > - /* Lock to protect vm_bo add/del/move on all lists of vm */ > - spinlock_t status_lock; > - > - /* Memory statistics for this vm, protected by status_lock */ > + /* Memory statistics for this vm, protected by stats_lock */ > + spinlock_t stats_lock; > struct amdgpu_mem_stats stats[__AMDGPU_PL_NUM]; > > /* > @@ -356,6 +354,8 @@ struct amdgpu_vm { > * PDs, PTs or per VM BOs. The state transits are: > * > * evicted -> relocated (PDs, PTs) or moved (per VM BOs) -> idle > + * > + * Lists are protected by the root PD dma_resv lock. > */ > > /* Per-VM and PT BOs who needs a validation */ > @@ -376,7 +376,10 @@ struct amdgpu_vm { > * state transits are: > * > * evicted_user or invalidated -> done > + * > + * Lists are protected by the invalidated_lock. > */ > + spinlock_t invalidated_lock; > > /* BOs for user mode queues that need a validation */ > struct list_head evicted_user; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c > index 31a437ce9570..7bdd664f0770 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c > @@ -544,9 +544,7 @@ static void amdgpu_vm_pt_free(struct amdgpu_vm_bo_base > *entry) > entry->bo->vm_bo = NULL; > ttm_bo_set_bulk_move(&entry->bo->tbo, NULL); > > - spin_lock(&entry->vm->status_lock); > list_del(&entry->vm_status); > - spin_unlock(&entry->vm->status_lock); > amdgpu_bo_unref(&entry->bo); > } > > @@ -590,7 +588,6 @@ static void amdgpu_vm_pt_add_list(struct > amdgpu_vm_update_params *params, > struct amdgpu_vm_pt_cursor seek; > struct amdgpu_vm_bo_base *entry; > > - spin_lock(¶ms->vm->status_lock); > for_each_amdgpu_vm_pt_dfs_safe(params->adev, params->vm, cursor, > seek, entry) { > if (entry && entry->bo) > list_move(&entry->vm_status, > ¶ms->tlb_flush_waitlist); > @@ -598,7 +595,6 @@ static void amdgpu_vm_pt_add_list(struct > amdgpu_vm_update_params *params, > > /* enter start node now */ > list_move(&cursor->entry->vm_status, ¶ms->tlb_flush_waitlist); > - spin_unlock(¶ms->vm->status_lock); > } > > /** > -- > 2.43.0 >
