diff options
| author | Christian König <[email protected]> | 2015-08-07 11:53:36 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2015-08-17 20:51:09 +0000 |
| commit | 02bc0650bc930105346773253e5bf33c2917c601 (patch) | |
| tree | 5c396830d610cc9c1bf9fdb882a42325611325a9 /drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | |
| parent | drm/amdgpu: use the reservation obj wait for the UVD msg (diff) | |
| download | kernel-02bc0650bc930105346773253e5bf33c2917c601.tar.gz kernel-02bc0650bc930105346773253e5bf33c2917c601.zip | |
drm/amdgpu: remove amdgpu_fence_wait
It was just a wrapper for fence_wait anyway.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c index 2c42f50912b9..7cb711fc1ee2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c @@ -180,7 +180,7 @@ int amdgpu_sync_rings(struct amdgpu_sync *sync, if (amdgpu_enable_scheduler || (count >= AMDGPU_NUM_SYNCS)) { /* not enough room, wait manually */ - r = amdgpu_fence_wait(fence, false); + r = fence_wait(&fence->base, false); if (r) return r; continue; @@ -200,7 +200,7 @@ int amdgpu_sync_rings(struct amdgpu_sync *sync, if (!amdgpu_semaphore_emit_signal(other, semaphore)) { /* signaling wasn't successful wait manually */ amdgpu_ring_undo(other); - r = amdgpu_fence_wait(fence, false); + r = fence_wait(&fence->base, false); if (r) return r; continue; @@ -210,7 +210,7 @@ int amdgpu_sync_rings(struct amdgpu_sync *sync, if (!amdgpu_semaphore_emit_wait(ring, semaphore)) { /* waiting wasn't successful wait manually */ amdgpu_ring_undo(other); - r = amdgpu_fence_wait(fence, false); + r = fence_wait(&fence->base, false); if (r) return r; continue; |