hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: remove fence reset detection leftovers 

wait_event() never returns before the fence was signaled.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2016-02-11 14:42:33 +01:00 committed by Alex Deucher
parent fa5b500030
commit 9b3896686f
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
View File

@ -260,19 +260,16 @@ static bool amdgpu_fence_seq_signaled(struct amdgpu_ring *ring, u64 seq)
} }
/* /*
* amdgpu_ring_wait_seq_timeout - wait for seq of the specific ring to signal * amdgpu_ring_wait_seq - 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
* *
* return value: * return value:
* 0: seq signaled, and gpu not hang * 0: seq signaled, and gpu not hang
* -EDEADL: GPU hang detected
* -EINVAL: some paramter is not valid * -EINVAL: some paramter is not valid
*/ */
static int amdgpu_fence_ring_wait_seq(struct amdgpu_ring *ring, uint64_t seq) static int amdgpu_fence_ring_wait_seq(struct amdgpu_ring *ring, uint64_t seq)
{ {
bool signaled = false;
BUG_ON(!ring); BUG_ON(!ring);
if (seq > ring->fence_drv.sync_seq) if (seq > ring->fence_drv.sync_seq)
return -EINVAL; return -EINVAL;
@ -281,13 +278,10 @@ static int amdgpu_fence_ring_wait_seq(struct amdgpu_ring *ring, uint64_t seq)
return 0; return 0;
amdgpu_fence_schedule_fallback(ring); amdgpu_fence_schedule_fallback(ring);
wait_event(ring->fence_drv.fence_queue, ( wait_event(ring->fence_drv.fence_queue,
(signaled = amdgpu_fence_seq_signaled(ring, seq)))); amdgpu_fence_seq_signaled(ring, seq));
if (signaled)
return 0; return 0;
else
return -EDEADLK;
} }
/** /**