GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 22:58:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amdgpu: cleanup amdgpu_fence_ring_wait_seq

Browse source 
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2015-08-07 16:15:36 +02:00 • committed by Alex Deucher
parent 68ed3de434
commit 00d2a2b21d
1 changed files with 15 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
View file

@ -372,21 +372,15 @@ static bool amdgpu_fence_enable_signaling(struct fence *f)
* amdgpu_ring_wait_seq_timeout - wait for seq of the specific ring to signal * amdgpu_ring_wait_seq_timeout - wait for seq of the specific ring to signal
* @ring: ring to wait on for the seq number * @ring: ring to wait on for the seq number
* @seq: seq number wait for * @seq: seq number wait for
* @intr: if interruptible
* @timeout: jiffies before time out
* *
* return value: * return value:
* 0: time out but seq not signaled, and gpu not hang * 0: seq signaled, and gpu not hang
* X (X > 0): seq signaled and X means how many jiffies remains before time out * -EDEADL: GPU hang detected
* -EDEADL: GPU hang before time out
* -ESYSRESTART: interrupted before seq signaled
* -EINVAL: some paramter is not valid * -EINVAL: some paramter is not valid
*/ */
static long amdgpu_fence_ring_wait_seq_timeout(struct amdgpu_ring *ring, uint64_t seq, static int amdgpu_fence_ring_wait_seq(struct amdgpu_ring *ring, uint64_t seq)
bool intr, long timeout)
{ {
struct amdgpu_device *adev = ring->adev; struct amdgpu_device *adev = ring->adev;
long r = 0;
bool signaled = false; bool signaled = false;
BUG_ON(!ring); BUG_ON(!ring);
@ -394,50 +388,16 @@ static long amdgpu_fence_ring_wait_seq_timeout(struct amdgpu_ring *ring, uint64_
return -EINVAL; return -EINVAL;
if (atomic64_read(&ring->fence_drv.last_seq) >= seq) if (atomic64_read(&ring->fence_drv.last_seq) >= seq)
return timeout; return 0;
while (1) { wait_event(ring->fence_drv.fence_queue, (
if (intr) { (signaled = amdgpu_fence_seq_signaled(ring, seq))
r = wait_event_interruptible_timeout(ring->fence_drv.fence_queue, ( || adev->needs_reset));
(signaled = amdgpu_fence_seq_signaled(ring, seq))
|| adev->needs_reset), AMDGPU_FENCE_JIFFIES_TIMEOUT);
if (r == -ERESTARTSYS) /* interrupted */ if (signaled)
return r; return 0;
} else { else
r = wait_event_timeout(ring->fence_drv.fence_queue, ( return -EDEADLK;
(signaled = amdgpu_fence_seq_signaled(ring, seq))
|| adev->needs_reset), AMDGPU_FENCE_JIFFIES_TIMEOUT);
}
if (signaled) {
/* seq signaled */
if (timeout == MAX_SCHEDULE_TIMEOUT)
return timeout;
return (timeout - AMDGPU_FENCE_JIFFIES_TIMEOUT - r);
}
else if (adev->needs_reset) {
return -EDEADLK;
}
/* check if it's a lockup */
if (amdgpu_ring_is_lockup(ring)) {
uint64_t last_seq = atomic64_read(&ring->fence_drv.last_seq);
/* ring lookup */
dev_warn(adev->dev, "GPU lockup (waiting for "
"0x%016llx last fence id 0x%016llx on"
" ring %d)\n",
seq, last_seq, ring->idx);
wake_up_all(&ring->fence_drv.fence_queue);
return -EDEADLK;
}
if (timeout < MAX_SCHEDULE_TIMEOUT) {
timeout -= AMDGPU_FENCE_JIFFIES_TIMEOUT;
if (timeout < 1)
return 0;
}
}
} }
/** /**
@ -452,16 +412,12 @@ static long amdgpu_fence_ring_wait_seq_timeout(struct amdgpu_ring *ring, uint64_
*/ */
int amdgpu_fence_wait_next(struct amdgpu_ring *ring) int amdgpu_fence_wait_next(struct amdgpu_ring *ring)
{ {
long r;
uint64_t seq = atomic64_read(&ring->fence_drv.last_seq) + 1ULL; uint64_t seq = atomic64_read(&ring->fence_drv.last_seq) + 1ULL;
if (seq >= ring->fence_drv.sync_seq[ring->idx]) if (seq >= ring->fence_drv.sync_seq[ring->idx])
return -ENOENT; return -ENOENT;
r = amdgpu_fence_ring_wait_seq_timeout(ring, seq, false, MAX_SCHEDULE_TIMEOUT);
if (r < 0)
return r;
return 0; return amdgpu_fence_ring_wait_seq(ring, seq);
} }
/** /**
@ -476,22 +432,12 @@ int amdgpu_fence_wait_next(struct amdgpu_ring *ring)
*/ */
int amdgpu_fence_wait_empty(struct amdgpu_ring *ring) int amdgpu_fence_wait_empty(struct amdgpu_ring *ring)
{ {
long r;
uint64_t seq = ring->fence_drv.sync_seq[ring->idx]; uint64_t seq = ring->fence_drv.sync_seq[ring->idx];
if (!seq) if (!seq)
return 0; return 0;
r = amdgpu_fence_ring_wait_seq_timeout(ring, seq, false, MAX_SCHEDULE_TIMEOUT); return amdgpu_fence_ring_wait_seq(ring, seq);
if (r < 0) {
if (r == -EDEADLK)
return -EDEADLK;
dev_err(ring->adev->dev, "error waiting for ring[%d] to become idle (%ld)\n",
ring->idx, r);
}
return 0;
} }
/** /**