Merge tag 'for-5.13/libata-2021-04-27' of git://git.kernel.dk/linux-block

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_vm.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 326dae31b675d042ecfc17329f5b4599fe95e43c..0ffdf847cad0a2e7c4575be981c8b72666c3c9dd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -92,13 +92,13 @@ struct amdgpu_prt_cb {
 static inline void amdgpu_vm_eviction_lock(struct amdgpu_vm *vm)
 {
        mutex_lock(&vm->eviction_lock);
 static inline void amdgpu_vm_eviction_lock(struct amdgpu_vm *vm)
 {
        mutex_lock(&vm->eviction_lock);

-       vm->saved_flags = memalloc_nofs_save();
+       vm->saved_flags = memalloc_noreclaim_save();

 }
 
 static inline int amdgpu_vm_eviction_trylock(struct amdgpu_vm *vm)
 {
        if (mutex_trylock(&vm->eviction_lock)) {
 }
 
 static inline int amdgpu_vm_eviction_trylock(struct amdgpu_vm *vm)
 {
        if (mutex_trylock(&vm->eviction_lock)) {

-               vm->saved_flags = memalloc_nofs_save();
+               vm->saved_flags = memalloc_noreclaim_save();

                return 1;
        }
        return 0;
                return 1;
        }
        return 0;


@@ -106,7 +106,7 @@ static inline int amdgpu_vm_eviction_trylock(struct amdgpu_vm *vm)
 
 static inline void amdgpu_vm_eviction_unlock(struct amdgpu_vm *vm)
 {
 
 static inline void amdgpu_vm_eviction_unlock(struct amdgpu_vm *vm)
 {

-       memalloc_nofs_restore(vm->saved_flags);
+       memalloc_noreclaim_restore(vm->saved_flags);

        mutex_unlock(&vm->eviction_lock);
 }
 
        mutex_unlock(&vm->eviction_lock);
 }
 


@@ -638,15 +638,15 @@ void amdgpu_vm_move_to_lru_tail(struct amdgpu_device *adev,
        struct amdgpu_vm_bo_base *bo_base;
 
        if (vm->bulk_moveable) {
        struct amdgpu_vm_bo_base *bo_base;
 
        if (vm->bulk_moveable) {

-               spin_lock(&ttm_bo_glob.lru_lock);
+               spin_lock(&adev->mman.bdev.lru_lock);

                ttm_bo_bulk_move_lru_tail(&vm->lru_bulk_move);
                ttm_bo_bulk_move_lru_tail(&vm->lru_bulk_move);

-               spin_unlock(&ttm_bo_glob.lru_lock);
+               spin_unlock(&adev->mman.bdev.lru_lock);

                return;
        }
 
        memset(&vm->lru_bulk_move, 0, sizeof(vm->lru_bulk_move));
 
                return;
        }
 
        memset(&vm->lru_bulk_move, 0, sizeof(vm->lru_bulk_move));
 

-       spin_lock(&ttm_bo_glob.lru_lock);
+       spin_lock(&adev->mman.bdev.lru_lock);

        list_for_each_entry(bo_base, &vm->idle, vm_status) {
                struct amdgpu_bo *bo = bo_base->bo;
 
        list_for_each_entry(bo_base, &vm->idle, vm_status) {
                struct amdgpu_bo *bo = bo_base->bo;
 


@@ -660,7 +660,7 @@ void amdgpu_vm_move_to_lru_tail(struct amdgpu_device *adev,
                                                &bo->shadow->tbo.mem,
                                                &vm->lru_bulk_move);
        }
                                                &bo->shadow->tbo.mem,
                                                &vm->lru_bulk_move);
        }

-       spin_unlock(&ttm_bo_glob.lru_lock);
+       spin_unlock(&adev->mman.bdev.lru_lock);

 
        vm->bulk_moveable = true;
 }
 
        vm->bulk_moveable = true;
 }


@@ -869,6 +869,7 @@ static void amdgpu_vm_bo_param(struct amdgpu_device *adev, struct amdgpu_vm *vm,
        bp->domain = amdgpu_bo_get_preferred_pin_domain(adev, bp->domain);
        bp->flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS |
                AMDGPU_GEM_CREATE_CPU_GTT_USWC;
        bp->domain = amdgpu_bo_get_preferred_pin_domain(adev, bp->domain);
        bp->flags = AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS |
                AMDGPU_GEM_CREATE_CPU_GTT_USWC;

+       bp->bo_ptr_size = sizeof(struct amdgpu_bo);

        if (vm->use_cpu_for_update)
                bp->flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
        else if (!vm->root.base.bo || vm->root.base.bo->shadow)
        if (vm->use_cpu_for_update)
                bp->flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
        else if (!vm->root.base.bo || vm->root.base.bo->shadow)