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

Commit 9aa36876 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

One user visible fix to stop misreport GPU hangs and subsequent resets.
* 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: update lockup tracking when scheduling in empty ring
parents 784a4d55 8444d5c6

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);