aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
authormonk.liu <monk.liu@amd.com>2015-07-30 02:56:18 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:50:47 -0400
commit2e536084f24f99f0a2cc0b6ce38ad8298ea58b22 (patch)
treeef64547a4f8720dd6f532d06850414581c2120c5 /drivers/gpu/drm/amd/amdgpu
parent8128765ce5fb68e3b34a8f524791d5758514f511 (diff)
drm/amdgpu: use kernel fence interface when possible
Signed-off-by: monk.liu <monk.liu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 67d9277d6168..4834725b627e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -622,18 +622,11 @@ static long amdgpu_fence_wait_seq_timeout(struct amdgpu_device *adev,
622 */ 622 */
623int amdgpu_fence_wait(struct amdgpu_fence *fence, bool intr) 623int amdgpu_fence_wait(struct amdgpu_fence *fence, bool intr)
624{ 624{
625 uint64_t seq[AMDGPU_MAX_RINGS] = {};
626 long r; 625 long r;
627 626
628 seq[fence->ring->idx] = fence->seq; 627 r = fence_wait_timeout(&fence->base, intr, MAX_SCHEDULE_TIMEOUT);
629 r = amdgpu_fence_wait_seq_timeout(fence->ring->adev, seq, intr, MAX_SCHEDULE_TIMEOUT); 628 if (r < 0)
630 if (r < 0) { 629 return r;
631 return r;
632 }
633
634 r = fence_signal(&fence->base);
635 if (!r)
636 FENCE_TRACE(&fence->base, "signaled from fence_wait\n");
637 return 0; 630 return 0;
638} 631}
639 632