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

Commit 6cc2fda2 authored Sep 19, 2014 by Michel Dänzer Committed by Alex Deucher Sep 22, 2014

drm/radeon: Make IH ring overflow debugging output more useful



Use the same format for all ring indices, and fix the calculation of the
post-overflow RPTR.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 11bab0ae

drivers/gpu/drm/radeon/cik.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -7756,8 +7756,8 @@ static inline u32 cik_get_ih_wptr(struct radeon_device *rdev)
		* 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);
		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, 0x%08X, 0x%08X)\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;

drivers/gpu/drm/radeon/evergreen.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4754,8 +4754,8 @@ static u32 evergreen_get_ih_wptr(struct radeon_device *rdev)
		* 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);
		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, 0x%08X, 0x%08X)\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;

drivers/gpu/drm/radeon/r600.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3797,8 +3797,8 @@ static u32 r600_get_ih_wptr(struct radeon_device *rdev)
		* 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);
		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, 0x%08X, 0x%08X)\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;

drivers/gpu/drm/radeon/si.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -6321,8 +6321,8 @@ static inline u32 si_get_ih_wptr(struct radeon_device *rdev)
		* 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);
		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, 0x%08X, 0x%08X)\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;