Commit 873f44c3 authored by Prike Liang's avatar Prike Liang Committed by Alex Deucher
Browse files

drm/amdgpu: keeping waiting userq fence infinitely 



Keeping waiting the userq fence infinitely until
hang detection, and then suspend the hang queue and
set the fence error.

Signed-off-by: default avatarPrike Liang <Prike.Liang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2a28f966

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

+9 −4
Original line number Diff line number Diff line
@@ -213,19 +213,24 @@ amdgpu_userq_map_helper(struct amdgpu_userq_mgr *uq_mgr, 
	return r;

}



static void

static int

amdgpu_userq_wait_for_last_fence(struct amdgpu_userq_mgr *uq_mgr,

				 struct amdgpu_usermode_queue *queue)

{

	struct dma_fence *f = queue->last_fence;

	int ret;

	int ret = 0;



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

		ret = dma_fence_wait_timeout(f, true, msecs_to_jiffies(100));

		if (ret <= 0)

		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;

		}

	}



	return ret;

}



static void