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

Commit e8c214d2 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: fix irq ring buffer overflow handling 



We must mask out the overflow bit as well, otherwise
the wptr will never match the rptr again and the interrupt
handler will loop forever.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
parent 5b753275

drivers/gpu/drm/radeon/cik.c

+1 −0
Original line number Diff line number Diff line
@@ -7376,6 +7376,7 @@ static inline u32 cik_get_ih_wptr(struct radeon_device *rdev) 
		tmp = RREG32(IH_RB_CNTL);

		tmp |= IH_WPTR_OVERFLOW_CLEAR;

		WREG32(IH_RB_CNTL, tmp);

		wptr &= ~RB_OVERFLOW;

	}

	return (wptr & rdev->ih.ptr_mask);

}

drivers/gpu/drm/radeon/evergreen.c

+1 −0
Original line number Diff line number Diff line
@@ -4756,6 +4756,7 @@ static u32 evergreen_get_ih_wptr(struct radeon_device *rdev) 
		tmp = RREG32(IH_RB_CNTL);

		tmp |= IH_WPTR_OVERFLOW_CLEAR;

		WREG32(IH_RB_CNTL, tmp);

		wptr &= ~RB_OVERFLOW;

	}

	return (wptr & rdev->ih.ptr_mask);

}

drivers/gpu/drm/radeon/r600.c

+1 −0
Original line number Diff line number Diff line
@@ -3795,6 +3795,7 @@ static u32 r600_get_ih_wptr(struct radeon_device *rdev) 
		tmp = RREG32(IH_RB_CNTL);

		tmp |= IH_WPTR_OVERFLOW_CLEAR;

		WREG32(IH_RB_CNTL, tmp);

		wptr &= ~RB_OVERFLOW;

	}

	return (wptr & rdev->ih.ptr_mask);

}

drivers/gpu/drm/radeon/si.c

+1 −0
Original line number Diff line number Diff line
@@ -6103,6 +6103,7 @@ static inline u32 si_get_ih_wptr(struct radeon_device *rdev) 
		tmp = RREG32(IH_RB_CNTL);

		tmp |= IH_WPTR_OVERFLOW_CLEAR;

		WREG32(IH_RB_CNTL, tmp);

		wptr &= ~RB_OVERFLOW;

	}

	return (wptr & rdev->ih.ptr_mask);

}