drm/amdgpu: add VM update fences back to the root PD v2

Add update fences to the root PD while mapping BOs.

Otherwise PDs freed during the mapping won't wait for
updates to finish and can cause corruptions.

v2: rebased on drm-misc-next

Signed-off-by: Christian König <christian.koenig@amd.com>
Fixes: 90b69cdc5f159 drm/amdgpu: stop adding VM updates fences to the resv obj
Reviewed-by: xinhui pan <xinhui.pan@amd.com>
Tested-by: Luben Tuikov <luben.tuikov@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 9969f82ac4baefaa91fa20d566ac18daafa77405..f44c26c373a17ff99ada66c8f8bf985142c59f89 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -585,8 +585,8 @@ void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm,
 {
        entry->priority = 0;
        entry->tv.bo = &vm->root.base.bo->tbo;
-       /* One for TTM and one for the CS job */
-       entry->tv.num_shared = 2;
+       /* Two for VM updates, one for TTM and one for the CS job */
+       entry->tv.num_shared = 4;
        entry->user_pages = NULL;
        list_add(&entry->tv.head, validated);
 }
@@ -1599,6 +1599,16 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
                goto error_unlock;
        }
 
+       if (flags & AMDGPU_PTE_VALID) {
+               struct amdgpu_bo *root = vm->root.base.bo;
+
+               if (!dma_fence_is_signaled(vm->last_direct))
+                       amdgpu_bo_fence(root, vm->last_direct, true);
+
+               if (!dma_fence_is_signaled(vm->last_delayed))
+                       amdgpu_bo_fence(root, vm->last_delayed, true);
+       }
+
        r = vm->update_funcs->prepare(&params, resv, sync_mode);
        if (r)
                goto error_unlock;