Skip to content

Commit 05ce444

Browse files
amd-sukhatrialexdeucher
authored andcommitted
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: Sunil Khatri <sunil.khatri@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 38476bd commit 05ce444

1 file changed

Lines changed: 4 additions & 13 deletions

File tree

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -427,23 +427,14 @@ static int amdgpu_userq_map_helper(struct amdgpu_usermode_queue *queue)
427427
return r;
428428
}
429429

430-
static int amdgpu_userq_wait_for_last_fence(struct amdgpu_usermode_queue *queue)
430+
static void amdgpu_userq_wait_for_last_fence(struct amdgpu_usermode_queue *queue)
431431
{
432-
struct amdgpu_userq_mgr *uq_mgr = queue->userq_mgr;
433432
struct dma_fence *f = queue->last_fence;
434-
int ret = 0;
435433

436-
if (f && !dma_fence_is_signaled(f)) {
437-
ret = dma_fence_wait_timeout(f, true, MAX_SCHEDULE_TIMEOUT);
438-
if (ret <= 0) {
439-
drm_file_err(uq_mgr->file, "Timed out waiting for fence=%llu:%llu\n",
440-
f->context, f->seqno);
441-
queue->state = AMDGPU_USERQ_STATE_HUNG;
442-
return -ETIME;
443-
}
444-
}
434+
if (!f)
435+
return;
445436

446-
return ret;
437+
dma_fence_wait(f, false);
447438
}
448439

449440
static void amdgpu_userq_cleanup(struct amdgpu_usermode_queue *queue)

0 commit comments

Comments
 (0)