1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index 7570f2439a11..4af92649c4a4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -60,6 +60,7 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
         (*job)->need_pipeline_sync = false;
 
         amdgpu_sync_create(&(*job)->sync);
+        amdgpu_sync_create(&(*job)->sched_sync);
 
         return 0;
 }
@@ -98,6 +99,7 @@ static void amdgpu_job_free_cb(struct amd_sched_job *s_job)
 
         dma_fence_put(job->fence);
         amdgpu_sync_free(&job->sync);
+        amdgpu_sync_free(&job->sched_sync);
         kfree(job);
 }
 
@@ -107,6 +109,7 @@ void amdgpu_job_free(struct amdgpu_job *job)
 
         dma_fence_put(job->fence);
         amdgpu_sync_free(&job->sync);
+        amdgpu_sync_free(&job->sched_sync);
         kfree(job);
 }
 
@@ -139,10 +142,10 @@ static struct dma_fence *amdgpu_job_dependency(struct amd_sched_job *sched_job)
         struct amdgpu_vm *vm = job->vm;
 
         struct dma_fence *fence = amdgpu_sync_get_fence(&job->sync);
+        int r;
 
         while (fence == NULL && vm && !job->vm_id) {
                 struct amdgpu_ring *ring = job->ring;
-                int r;
 
                 r = amdgpu_vm_grab_id(vm, ring, &job->sync,
                                       &job->base.s_fence->finished,
@@ -153,9 +156,11 @@ static struct dma_fence *amdgpu_job_dependency(struct amd_sched_job *sched_job)
                 fence = amdgpu_sync_get_fence(&job->sync);
         }
 
-        if (amd_sched_dependency_optimized(fence, sched_job->s_entity))
-                job->need_pipeline_sync = true;
-
+        if (amd_sched_dependency_optimized(fence, sched_job->s_entity)) {
+                r = amdgpu_sync_fence(job->adev, &job->sched_sync, fence);
+                if (r)
+                        DRM_ERROR("Error adding fence to sync (%d)\n", r);
+        }
         return fence;
 }