Skip to content

Commit 1e57e72

Browse files
amd-sukhatrialexdeucher
authored andcommitted
drm/amdgpu/userq: fence wait for max time in amdgpu_userq_wait_for_signal
wait for infinite time for fences in function amdgpu_userq_wait_for_signal and for that use dma_fence_wait(f, false); Suggested-by: Christian König <christian.koenig@amd.com> 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 d65bfb1 commit 1e57e72

1 file changed

Lines changed: 3 additions & 12 deletions

File tree

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,29 +1280,20 @@ void amdgpu_userq_reset_work(struct work_struct *work)
12801280
amdgpu_device_gpu_recover(adev, NULL, &reset_context);
12811281
}
12821282

1283-
static int
1283+
static void
12841284
amdgpu_userq_wait_for_signal(struct amdgpu_userq_mgr *uq_mgr)
12851285
{
12861286
struct amdgpu_usermode_queue *queue;
12871287
unsigned long queue_id;
1288-
int ret;
12891288

12901289
xa_for_each(&uq_mgr->userq_xa, queue_id, queue) {
12911290
struct dma_fence *f = queue->last_fence;
12921291

1293-
if (!f || dma_fence_is_signaled(f))
1292+
if (!f)
12941293
continue;
12951294

1296-
ret = dma_fence_wait_timeout(f, true, msecs_to_jiffies(100));
1297-
if (ret <= 0) {
1298-
drm_file_err(uq_mgr->file, "Timed out waiting for fence=%llu:%llu\n",
1299-
f->context, f->seqno);
1300-
1301-
return -ETIMEDOUT;
1302-
}
1295+
dma_fence_wait(f, false);
13031296
}
1304-
1305-
return 0;
13061297
}
13071298

13081299
void

0 commit comments

Comments
 (0)