Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 00:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: merge amdgpu_fence_process and _activity

Browse Source 
No need to keep the two separate any more.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
This commit is contained in:
Christian König 2016-03-11 17:57:56 +01:00 committed by Alex Deucher
parent d9713ef6b9
commit ca08e04d56
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,15 +155,15 @@ static void amdgpu_fence_schedule_fallback(struct amdgpu_ring *ring)
} }
/** /**
* amdgpu_fence_activity - check for fence activity * amdgpu_fence_process - check for fence activity
* *
* @ring: pointer to struct amdgpu_ring * @ring: pointer to struct amdgpu_ring
* *
* Checks the current fence value and calculates the last * Checks the current fence value and calculates the last
* signalled fence value. Returns true if activity occured * signalled fence value. Wakes the fence queue if the
* on the ring, and the fence_queue should be waken up. * sequence number has increased.
*/ */
static bool amdgpu_fence_activity(struct amdgpu_ring *ring) void amdgpu_fence_process(struct amdgpu_ring *ring)
{ {
uint64_t seq, last_seq, last_emitted; uint64_t seq, last_seq, last_emitted;
bool wake = false; bool wake = false;
@ -193,21 +193,7 @@ static bool amdgpu_fence_activity(struct amdgpu_ring *ring)
if (seq < last_emitted) if (seq < last_emitted)
amdgpu_fence_schedule_fallback(ring); amdgpu_fence_schedule_fallback(ring);
return wake; if (wake)
}
/**
* amdgpu_fence_process - process a fence
*
* @adev: amdgpu_device pointer
* @ring: ring index the fence is associated with
*
* Checks the current fence value and wakes the fence queue
* if the sequence number has increased (all asics).
*/
void amdgpu_fence_process(struct amdgpu_ring *ring)
{
if (amdgpu_fence_activity(ring))
wake_up_all(&ring->fence_drv.fence_queue); wake_up_all(&ring->fence_drv.fence_queue);
} }