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

Commit 7924e5eb authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon/kms: r600 handle irq vector ring overflow 



In some rare case i faced an irq overflow quickly followed by
a GPU lockup (hard hang) this patch try to deal with irq vector
ring overflow, so far haven't been able to reproduce it with
the patch.

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Reviewed-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 79c2bbc5

drivers/gpu/drm/radeon/r600.c

+7 −3
Original line number Diff line number Diff line
@@ -2648,9 +2648,13 @@ static inline u32 r600_get_ih_wptr(struct radeon_device *rdev) 
	wptr = RREG32(IH_RB_WPTR);



	if (wptr & RB_OVERFLOW) {

		WARN_ON(1);

		/* XXX deal with overflow */

		DRM_ERROR("IH RB overflow\n");

		/* When a ring buffer overflow happen start parsing interrupt

		 * from the last not overwritten vector (wptr + 16). Hopefully

		 * this should allow us to catchup.

		 */

		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, %d, %d)\n",

			wptr, rdev->ih.rptr, (wptr + 16) + rdev->ih.ptr_mask);

		rdev->ih.rptr = (wptr + 16) & rdev->ih.ptr_mask;

		tmp = RREG32(IH_RB_CNTL);

		tmp |= IH_WPTR_OVERFLOW_CLEAR;

		WREG32(IH_RB_CNTL, tmp);