Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca08e04d authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: merge amdgpu_fence_process and _activity 



No need to keep the two separate any more.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
parent d9713ef6

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

+5 −19
Original line number Diff line number Diff line
@@ -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

 *

 * Checks the current fence value and calculates the last

 * signalled fence value. Returns true if activity occured

 * on the ring, and the fence_queue should be waken up.

 * signalled fence value. Wakes the fence queue if the

 * 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;

	bool wake = false;
@@ -193,21 +193,7 @@ static bool amdgpu_fence_activity(struct amdgpu_ring *ring) 
	if (seq < last_emitted)

		amdgpu_fence_schedule_fallback(ring);



	return 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))

	if (wake)

		wake_up_all(&ring->fence_drv.fence_queue);

}