drm/radeon: cleanup false positive lockup handling

Check always when we calculate the free dw, not just the first time.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 668097abb42491845f5dbbbbe96db765eb31a65c..b14c86d57607f8e26d444f26de3c941ca813194a 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -349,7 +349,10 @@ void radeon_ring_free_size(struct radeon_device *rdev, struct radeon_ring *ring)
        ring->ring_free_dw -= ring->wptr;
        ring->ring_free_dw &= ring->ptr_mask;
        if (!ring->ring_free_dw) {
+               /* this is an empty ring */
                ring->ring_free_dw = ring->ring_size / 4;
+               /*  update lockup info to avoid false positive */
+               radeon_ring_lockup_update(rdev, ring);
        }
 }
 
@@ -373,12 +376,6 @@ int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *ring, unsi
        /* Align requested size with padding so unlock_commit can
         * pad safely */
        radeon_ring_free_size(rdev, ring);
-       if (ring->ring_free_dw == (ring->ring_size / 4)) {
-               /* This is an empty ring update lockup info to avoid
-                * false positive.
-                */
-               radeon_ring_lockup_update(rdev, ring);
-       }
        ndw = (ndw + ring->align_mask) & ~ring->align_mask;
        while (ndw > (ring->ring_free_dw - 1)) {
                radeon_ring_free_size(rdev, ring);