1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
index 068aeaff7183..cfd2999acc59 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
@@ -251,6 +251,20 @@ int amdgpu_sync_wait(struct amdgpu_sync *sync)
                 fence_put(e->fence);
                 kfree(e);
         }
+
+        if (amdgpu_enable_semaphores)
+                return 0;
+
+        for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
+                struct amdgpu_fence *fence = sync->sync_to[i];
+                if (!fence)
+                        continue;
+
+                r = fence_wait(&fence->base, false);
+                if (r)
+                        return r;
+        }
+
         return 0;
 }
 
@@ -285,7 +299,8 @@ int amdgpu_sync_rings(struct amdgpu_sync *sync,
                         return -EINVAL;
                 }
 
-                if (amdgpu_enable_scheduler || (count >= AMDGPU_NUM_SYNCS)) {
+                if (amdgpu_enable_scheduler || !amdgpu_enable_semaphores ||
+                    (count >= AMDGPU_NUM_SYNCS)) {
                         /* not enough room, wait manually */
                         r = fence_wait(&fence->base, false);
                         if (r)