Commit 05ce4441 authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu/userq: use dma_fence_wait_timeout without test for signalled 



In function amdgpu_userq_wait_for_last_fence use
dma_fence_wait to wait infinitely.

Also there is no need to print error as we wont be
timing out anymore.

Signed-off-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 38476bde

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

+4 −13
Original line number Diff line number Diff line
@@ -427,23 +427,14 @@ static int amdgpu_userq_map_helper(struct amdgpu_usermode_queue *queue) 
	return r;

}



static int amdgpu_userq_wait_for_last_fence(struct amdgpu_usermode_queue *queue)

static void amdgpu_userq_wait_for_last_fence(struct amdgpu_usermode_queue *queue)

{

	struct amdgpu_userq_mgr *uq_mgr = queue->userq_mgr;

	struct dma_fence *f = queue->last_fence;

	int ret = 0;



	if (f && !dma_fence_is_signaled(f)) {

		ret = dma_fence_wait_timeout(f, true, MAX_SCHEDULE_TIMEOUT);

		if (ret <= 0) {

			drm_file_err(uq_mgr->file, "Timed out waiting for fence=%llu:%llu\n",

				     f->context, f->seqno);

			queue->state = AMDGPU_USERQ_STATE_HUNG;

			return -ETIME;

		}

	}

	if (!f)

		return;



	return ret;

	dma_fence_wait(f, false);

}



static void amdgpu_userq_cleanup(struct amdgpu_usermode_queue *queue)