summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r600.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2014-09-19 12:22:07 +0900
committerAlex Deucher <alexander.deucher@amd.com>2014-09-22 17:24:26 -0400
commit6cc2fda213d7a939e151ea1b5ec8033cce732c08 (patch)
tree71a04731c793109399eb1b525f9f1ef15a884cb6 /drivers/gpu/drm/radeon/r600.c
parent11bab0ae9991b165b542294806013d1e06fb3294 (diff)
downloadop-kernel-dev-6cc2fda213d7a939e151ea1b5ec8033cce732c08.zip
op-kernel-dev-6cc2fda213d7a939e151ea1b5ec8033cce732c08.tar.gz
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
-rw-r--r--drivers/gpu/drm/radeon/r600.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 5514f1b..81f3236 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -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;
OpenPOWER on IntegriCloud