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

Commit 2e536084 authored by monk.liu's avatar monk.liu Committed by Alex Deucher
Browse files

drm/amdgpu: use kernel fence interface when possible 



Signed-off-by: default avatarmonk.liu <monk.liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
parent 8128765c

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

+3 −10
Original line number Diff line number Diff line
@@ -622,18 +622,11 @@ static long amdgpu_fence_wait_seq_timeout(struct amdgpu_device *adev, 
 */

int amdgpu_fence_wait(struct amdgpu_fence *fence, bool intr)

{

	uint64_t seq[AMDGPU_MAX_RINGS] = {};

	long r;



	seq[fence->ring->idx] = fence->seq;

	r = amdgpu_fence_wait_seq_timeout(fence->ring->adev, seq, intr, MAX_SCHEDULE_TIMEOUT);

	if (r < 0) {

	r = fence_wait_timeout(&fence->base, intr, MAX_SCHEDULE_TIMEOUT);

	if (r < 0)

		return  r;

	}



	r = fence_signal(&fence->base);

	if (!r)

		FENCE_TRACE(&fence->base, "signaled from fence_wait\n");

	return 0;

}