diff options
| author | Christian König <[email protected]> | 2015-09-05 09:12:27 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2015-09-23 21:23:29 +0000 |
| commit | 3daea9e3d3ecd217a63f35e63f18ea7138f2ae17 (patch) | |
| tree | 9a88ec12be8b0a1750fd50dc1d578a17a9070c9b /drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | |
| parent | Merge branch 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2... (diff) | |
| download | kernel-3daea9e3d3ecd217a63f35e63f18ea7138f2ae17.tar.gz kernel-3daea9e3d3ecd217a63f35e63f18ea7138f2ae17.zip | |
drm/amdgpu: add option to disable semaphores
Provide module parameter to enable/disable them. Still
enabled by default.
Signed-off-by: Christian König <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 17 |
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) |