[PATCH] drm/amdgpu: Deactivate SW interrupt fallback in amdgpu_fence_process v2

[Deucher, Alexander]

Acked-by: Alex Deucher <alexander.deucher at amd.com>

________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Christian König <ckoenig.leichtzumerken at gmail.com>
Sent: Monday, September 24, 2018 8:10:22 AM
To: amd-gfx at lists.freedesktop.org
Subject: [PATCH] drm/amdgpu: Deactivate SW interrupt fallback in amdgpu_fence_process v2

From: Andrey Grodzovsky <andrey.grodzovsky at amd.com>

Deactivate SW interrupt fallback when all emited fences are completed.
Also switch interrupt SW fallback message from INFO to WARN.

v2: shorten the warnign message a bit and only re-activate the timer during
processing if it was already activated before.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>
Suggested-by: Christian Konig <Christian.Koenig at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 1ae25835cad1..4e6e9c9654dd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -229,7 +229,8 @@ void amdgpu_fence_process(struct amdgpu_ring *ring)

         } while (atomic_cmpxchg(&drv->last_seq, last_seq, seq) != last_seq);

-       if (seq != ring->fence_drv.sync_seq)
+       if (del_timer(&ring->fence_drv.fallback_timer) &&
+           seq != ring->fence_drv.sync_seq)
                 amdgpu_fence_schedule_fallback(ring);

         if (unlikely(seq == last_seq))
@@ -274,7 +275,7 @@ static void amdgpu_fence_fallback(struct timer_list *t)
         struct amdgpu_ring *ring = from_timer(ring, t,
                                               fence_drv.fallback_timer);

-       DRM_INFO("Fallback to SW interrupt on ring %s due to HW interrupt time out", ring->name);
+       DRM_WARN("Fence fallback timer expired on ring %s\n", ring->name);
         amdgpu_fence_process(ring);
 }

--
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20180924/cf2b63fa/attachment.html>