<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"><!-- P {margin-top:0;margin-bottom:0;} --></style>
</head>
<body dir="ltr">
<div id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr">
<p style="margin-top:0;margin-bottom:0">Acked-by: Alex Deucher <alexander.deucher@amd.com><br>
</p>
</div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Christian König <ckoenig.leichtzumerken@gmail.com><br>
<b>Sent:</b> Monday, September 24, 2018 8:10:22 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org<br>
<b>Subject:</b> [PATCH] drm/amdgpu: Deactivate SW interrupt fallback in amdgpu_fence_process v2</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">From: Andrey Grodzovsky <andrey.grodzovsky@amd.com><br>
<br>
Deactivate SW interrupt fallback when all emited fences are completed.<br>
Also switch interrupt SW fallback message from INFO to WARN.<br>
<br>
v2: shorten the warnign message a bit and only re-activate the timer during<br>
processing if it was already activated before.<br>
<br>
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com><br>
Suggested-by: Christian Konig <Christian.Koenig@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 5 +++--<br>
1 file changed, 3 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c<br>
index 1ae25835cad1..4e6e9c9654dd 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c<br>
@@ -229,7 +229,8 @@ void amdgpu_fence_process(struct amdgpu_ring *ring)<br>
<br>
} while (atomic_cmpxchg(&drv->last_seq, last_seq, seq) != last_seq);<br>
<br>
- if (seq != ring->fence_drv.sync_seq)<br>
+ if (del_timer(&ring->fence_drv.fallback_timer) &&<br>
+ seq != ring->fence_drv.sync_seq)<br>
amdgpu_fence_schedule_fallback(ring);<br>
<br>
if (unlikely(seq == last_seq))<br>
@@ -274,7 +275,7 @@ static void amdgpu_fence_fallback(struct timer_list *t)<br>
struct amdgpu_ring *ring = from_timer(ring, t,<br>
fence_drv.fallback_timer);<br>
<br>
- DRM_INFO("Fallback to SW interrupt on ring %s due to HW interrupt time out", ring->name);<br>
+ DRM_WARN("Fence fallback timer expired on ring %s\n", ring->name);<br>
amdgpu_fence_process(ring);<br>
}<br>
<br>
-- <br>
2.14.1<br>
<br>
_______________________________________________<br>
amd-gfx mailing list<br>
amd-gfx@lists.freedesktop.org<br>
<a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a><br>
</div>
</span></font></div>
</body>
</html>