drm/amdgpu: Get rid of dep_sync as a seperate object.

Instead mark fence as explicit in it's amdgpu_sync_entry.

v2:
Fix use after free bug and add new parameter description.
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 7de519b86b78..3ecdbdfb04dd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -488,7 +488,7 @@ static int amdgpu_vm_grab_reserved_vmid_locked(struct amdgpu_vm *vm,
                 id->pd_gpu_addr = 0;
                 tmp = amdgpu_sync_peek_fence(&id->active, ring);
                 if (tmp) {
-                        r = amdgpu_sync_fence(adev, sync, tmp);
+                        r = amdgpu_sync_fence(adev, sync, tmp, false);
                         return r;
                 }
         }
@@ -496,7 +496,7 @@ static int amdgpu_vm_grab_reserved_vmid_locked(struct amdgpu_vm *vm,
         /* Good we can use this VMID. Remember this submission as
         * user of the VMID.
         */
-        r = amdgpu_sync_fence(ring->adev, &id->active, fence);
+        r = amdgpu_sync_fence(ring->adev, &id->active, fence, false);
         if (r)
                 goto out;
 
@@ -583,7 +583,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
                 }
 
 
-                r = amdgpu_sync_fence(ring->adev, sync, &array->base);
+                r = amdgpu_sync_fence(ring->adev, sync, &array->base, false);
                 dma_fence_put(&array->base);
                 if (r)
                         goto error;
@@ -626,7 +626,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
                 /* Good we can use this VMID. Remember this submission as
                  * user of the VMID.
                  */
-                r = amdgpu_sync_fence(ring->adev, &id->active, fence);
+                r = amdgpu_sync_fence(ring->adev, &id->active, fence, false);
                 if (r)
                         goto error;
 
@@ -646,7 +646,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
         id = idle;
 
         /* Remember this submission as user of the VMID */
-        r = amdgpu_sync_fence(ring->adev, &id->active, fence);
+        r = amdgpu_sync_fence(ring->adev, &id->active, fence, false);
         if (r)
                 goto error;
 
@@ -1657,7 +1657,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
                 addr = 0;
         }
 
-        r = amdgpu_sync_fence(adev, &job->sync, exclusive);
+        r = amdgpu_sync_fence(adev, &job->sync, exclusive, false);
         if (r)
                 goto error_free;