summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
diff options
context:
space:
mode:
authorChunming Zhou <david1.zhou@amd.com>2015-07-21 08:19:45 +0300
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 23:50:32 +0300
commit2c4888a0d392b206eb348d4fc6dec539eee2c534 (patch)
tree0c5f022cf7003731af591b19a04b27876afde590 /drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
parent9cb7e5a91f6cd4dc018cca7120d2da067f816d3a (diff)
downloadlinux-2c4888a0d392b206eb348d4fc6dec539eee2c534.tar.xz
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
index 9c292cf770f4..105a3b515174 100644
--- 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)