Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[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 904252456d2582d8da3bfe5f6fad647ec24b3627..d1b8afd105c9f6a8e56288f7b3c023171f7b2f75 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1098,8 +1098,8 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va,
                                bo = gem_to_amdgpu_bo(gobj);
                }
                mem = bo->tbo.resource;
                                bo = gem_to_amdgpu_bo(gobj);
                }
                mem = bo->tbo.resource;

-               if (mem->mem_type == TTM_PL_TT ||
-                   mem->mem_type == AMDGPU_PL_PREEMPT)
+               if (mem && (mem->mem_type == TTM_PL_TT ||
+                           mem->mem_type == AMDGPU_PL_PREEMPT))

                        pages_addr = bo->tbo.ttm->dma_address;
        }
 
                        pages_addr = bo->tbo.ttm->dma_address;
        }
 


@@ -2139,7 +2139,8 @@ long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout)
  * Returns:
  * 0 for success, error for failure.
  */
  * Returns:
  * 0 for success, error for failure.
  */

-int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp_id)
+int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
+                  int32_t xcp_id)

 {
        struct amdgpu_bo *root_bo;
        struct amdgpu_bo_vm *root;
 {
        struct amdgpu_bo *root_bo;
        struct amdgpu_bo_vm *root;


@@ -2158,6 +2159,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp
        INIT_LIST_HEAD(&vm->done);
        INIT_LIST_HEAD(&vm->pt_freed);
        INIT_WORK(&vm->pt_free_work, amdgpu_vm_pt_free_work);
        INIT_LIST_HEAD(&vm->done);
        INIT_LIST_HEAD(&vm->pt_freed);
        INIT_WORK(&vm->pt_free_work, amdgpu_vm_pt_free_work);

+       INIT_KFIFO(vm->faults);

 
        r = amdgpu_vm_init_entities(adev, vm);
        if (r)
 
        r = amdgpu_vm_init_entities(adev, vm);
        if (r)


@@ -2192,34 +2194,33 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp
                                false, &root, xcp_id);
        if (r)
                goto error_free_delayed;
                                false, &root, xcp_id);
        if (r)
                goto error_free_delayed;

-       root_bo = &root->bo;
+
+       root_bo = amdgpu_bo_ref(&root->bo);

        r = amdgpu_bo_reserve(root_bo, true);
        r = amdgpu_bo_reserve(root_bo, true);

-       if (r)
-               goto error_free_root;
+       if (r) {
+               amdgpu_bo_unref(&root->shadow);
+               amdgpu_bo_unref(&root_bo);
+               goto error_free_delayed;
+       }

 
 

+       amdgpu_vm_bo_base_init(&vm->root, vm, root_bo);

        r = dma_resv_reserve_fences(root_bo->tbo.base.resv, 1);
        if (r)
        r = dma_resv_reserve_fences(root_bo->tbo.base.resv, 1);
        if (r)

-               goto error_unreserve;
-
-       amdgpu_vm_bo_base_init(&vm->root, vm, root_bo);
+               goto error_free_root;

 
        r = amdgpu_vm_pt_clear(adev, vm, root, false);
        if (r)
 
        r = amdgpu_vm_pt_clear(adev, vm, root, false);
        if (r)

-               goto error_unreserve;
+               goto error_free_root;

 
        amdgpu_bo_unreserve(vm->root.bo);
 
        amdgpu_bo_unreserve(vm->root.bo);

-
-       INIT_KFIFO(vm->faults);
+       amdgpu_bo_unref(&root_bo);

 
        return 0;
 
 
        return 0;
 

-error_unreserve:
-       amdgpu_bo_unreserve(vm->root.bo);
-

 error_free_root:
 error_free_root:

-       amdgpu_bo_unref(&root->shadow);
+       amdgpu_vm_pt_free_root(adev, vm);
+       amdgpu_bo_unreserve(vm->root.bo);

        amdgpu_bo_unref(&root_bo);
        amdgpu_bo_unref(&root_bo);

-       vm->root.bo = NULL;

 
 error_free_delayed:
        dma_fence_put(vm->last_tlb_flush);
 
 error_free_delayed:
        dma_fence_put(vm->last_tlb_flush);