Yes, of course. I have sent out a new patch with the code cleaned. Regards, Evan From: Christian König [mailto:ckoenig.leichtzumerken@xxxxxxxxx] Sent: Tuesday, March 27, 2018 3:52 PM To: Quan, Evan <Evan.Quan at amd.com>; amd-gfx at lists.freedesktop.org Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Liu, Monk <Monk.Liu at amd.com> Subject: Re: [PATCH] drm/amdgpu: for sriov timeout is still enforced on compute rings Am 27.03.2018 um 08:46 schrieb Evan Quan: Sriov still wants these error messags on timeout. So, for sriov use case, the timeout setting on compute rings is kept. Change-Id: Id0af6959a8023c8d683ff680de7c583f84cfeab3 Signed-off-by: Evan Quan <evan.quan at amd.com><mailto:evan.quan at amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c index 455a81e..2cc5a75 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c @@ -435,7 +435,8 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring, if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ) { r = drm_sched_init(&ring->sched, &amdgpu_sched_ops, num_hw_submission, amdgpu_job_hang_limit, - (ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE) ? + /* for non-sriov case, no timeout enforce on compute ring */ + ((ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE) && !amdgpu_sriov_vf(ring->adev)) ? This starts to look a bit messy, can you add a local variable and separate the exceptions, e.g. something like: long timeout = msecs_to_jiffies(amdgpu_lockup_timeout); if (ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE) && !amdgpu_sriov_vf(ring->adev)) timeout = MAX_SCHEDULE_TIMEOUT; .... Apart from that the patch looks good to me, Christian. MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(amdgpu_lockup_timeout), ring->name); if (r) { -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20180327/01b998bb/attachment-0001.html>
