drm/amdgpu: disable hw semaphore with scheduler

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Acked-by: Christian K?nig <christian.koenig@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
index 9c292cf770f43bc39b0d88dee930e55e845238c4..105a3b51517442fa18b9f7d673e07007c506c55d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
@@ -165,7 +165,7 @@ int amdgpu_sync_rings(struct amdgpu_sync *sync,
                        return -EINVAL;
                }
 
-               if (count >= AMDGPU_NUM_SYNCS) {
+               if (amdgpu_enable_scheduler || (count >= AMDGPU_NUM_SYNCS)) {
                        /* not enough room, wait manually */
                        r = amdgpu_fence_wait(fence, false);
                        if (r)