Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82dc62a3 authored by Christian König's avatar Christian König
Browse files

drm/radeon: cleanup false positive lockup handling 



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

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2d2fe3f9

drivers/gpu/drm/radeon/radeon_ring.c

+3 −6
Original line number Diff line number Diff line
@@ -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);