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, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 93d3cef66503..4cea9ab237ac 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -786,7 +786,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
                 return r;
 
         r = amdgpu_sync_fence(adev, &p->job->sync,
-                              fpriv->prt_va->last_pt_update);
+                              fpriv->prt_va->last_pt_update, false);
         if (r)
                 return r;
 
@@ -800,7 +800,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
                         return r;
 
                 f = bo_va->last_pt_update;
-                r = amdgpu_sync_fence(adev, &p->job->sync, f);
+                r = amdgpu_sync_fence(adev, &p->job->sync, f, false);
                 if (r)
                         return r;
         }
@@ -823,7 +823,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
                                 return r;
 
                         f = bo_va->last_pt_update;
-                        r = amdgpu_sync_fence(adev, &p->job->sync, f);
+                        r = amdgpu_sync_fence(adev, &p->job->sync, f, false);
                         if (r)
                                 return r;
                 }
@@ -834,7 +834,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
         if (r)
                 return r;
 
-        r = amdgpu_sync_fence(adev, &p->job->sync, vm->last_update);
+        r = amdgpu_sync_fence(adev, &p->job->sync, vm->last_update, false);
         if (r)
                 return r;
 
@@ -1038,8 +1038,8 @@ static int amdgpu_cs_process_fence_dep(struct amdgpu_cs_parser *p,
                         amdgpu_ctx_put(ctx);
                         return r;
                 } else if (fence) {
-                        r = amdgpu_sync_fence(p->adev, &p->job->dep_sync,
-                                              fence);
+                        r = amdgpu_sync_fence(p->adev, &p->job->sync, fence,
+                                        true);
                         dma_fence_put(fence);
                         amdgpu_ctx_put(ctx);
                         if (r)
@@ -1058,7 +1058,7 @@ static int amdgpu_syncobj_lookup_and_add_to_sync(struct amdgpu_cs_parser *p,
         if (r)
                 return r;
 
-        r = amdgpu_sync_fence(p->adev, &p->job->dep_sync, fence);
+        r = amdgpu_sync_fence(p->adev, &p->job->sync, fence, true);
         dma_fence_put(fence);
 
         return r;