Commit 8444d5c6 authored Jun 19, 2013 by Jerome Glisse Committed by Alex Deucher Jun 20, 2013

drm/radeon: update lockup tracking when scheduling in empty ring



There might be issue with lockup detection when scheduling on an
empty ring that have been sitting idle for a while. Thus update
the lockup tracking data when scheduling new work in an empty ring.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Tested-by: Andy Lutomirski <luto@amacapital.net>
Cc: stable@vger.kernel.org
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent c139b1ee

drivers/gpu/drm/radeon/radeon_ring.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -402,6 +402,13 @@ int radeon_ring_alloc(struct radeon_device rdev, struct radeon_ring ring, unsi
		return -ENOMEM;
		/* 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(ring);
		}
		ndw = (ndw + ring->align_mask) & ~ring->align_mask;
		while (ndw > (ring->ring_free_dw - 1)) {
		radeon_ring_free_size(rdev, ring);