Attachment 30893 Details for Bug 24837 – fix ring info in debugfs on r600+

[patch] fix ring info in debugfs on r600+

0001-drm-radeon-kms-fix-ring-info-in-debugfs-on-r600.patch (text/plain), 1.72 KB, created by Rafał Miłecki on 2009-11-01 11:33:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafał Miłecki

Created: 2009-11-01 11:33:09 UTC

Size: 1.72 KB

patch

obsolete

>From d3da7e5f7f808f3d7db701135feb684d3f82c16b Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
>Date: Sun, 1 Nov 2009 20:29:36 +0100
>Subject: [PATCH] drm/radeon/kms: fix ring info in debugfs on r600+
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: RafaÅ MiÅecki <zajec5@gmail.com>
>---
> drivers/gpu/drm/radeon/r600.c |   12 +++++-------
> 1 files changed, 5 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index 1b5aa1f..1e995c0 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -1791,20 +1791,18 @@ static int r600_debugfs_cp_ring_info(struct seq_file *m, void *data)
> 	struct drm_info_node *node = (struct drm_info_node *) m->private;
> 	struct drm_device *dev = node->minor->dev;
> 	struct radeon_device *rdev = dev->dev_private;
>-	uint32_t rdp, wdp;
> 	unsigned count, i, j;
> 
> 	radeon_ring_free_size(rdev);
>-	rdp = RREG32(CP_RB_RPTR);
>-	wdp = RREG32(CP_RB_WPTR);
>-	count = (rdp + rdev->cp.ring_size - wdp) & rdev->cp.ptr_mask;
>+	count = (rdev->cp.ring_size / 4) - rdev->cp.ring_free_dw;
> 	seq_printf(m, "CP_STAT 0x%08x\n", RREG32(CP_STAT));
>-	seq_printf(m, "CP_RB_WPTR 0x%08x\n", wdp);
>-	seq_printf(m, "CP_RB_RPTR 0x%08x\n", rdp);
>+	seq_printf(m, "CP_RB_WPTR 0x%08x\n", rdev->cp.wptr);
>+	seq_printf(m, "CP_RB_RPTR 0x%08x\n", rdev->cp.rptr);
> 	seq_printf(m, "%u free dwords in ring\n", rdev->cp.ring_free_dw);
> 	seq_printf(m, "%u dwords in ring\n", count);
>+	i = rdev->cp.rptr;
> 	for (j = 0; j <= count; j++) {
>-		i = (rdp + j) & rdev->cp.ptr_mask;
>+		i = (i + 1) & rdev->cp.ptr_mask;
> 		seq_printf(m, "r[%04d]=0x%08x\n", i, rdev->cp.ring[i]);
> 	}
> 	return 0;
>-- 
>1.6.4.2
>

Actions: View | Splinter Review

Attachments on bug 24837: 30893 | 30901 | 30995

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.