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

Commit 4d009190 authored by Jerome Glisse's avatar Jerome Glisse Committed by Alex Deucher
Browse files

drm/radeon: improve ring debugfs printing 



Print 32dword before last know rptr as problem most likely comes
from previous command. Also small cosmetic change to the printing.

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 74795486

drivers/gpu/drm/radeon/radeon_ring.c

+13 −7
Original line number Diff line number Diff line
@@ -770,22 +770,28 @@ static int radeon_debugfs_ring_info(struct seq_file *m, void *data) 
	int ridx = *(int*)node->info_ent->data;

	struct radeon_ring *ring = &rdev->ring[ridx];

	unsigned count, i, j;

	u32 tmp;



	radeon_ring_free_size(rdev, ring);

	count = (ring->ring_size / 4) - ring->ring_free_dw;

	seq_printf(m, "wptr(0x%04x): 0x%08x\n", ring->wptr_reg, RREG32(ring->wptr_reg));

	seq_printf(m, "rptr(0x%04x): 0x%08x\n", ring->rptr_reg, RREG32(ring->rptr_reg));

	tmp = RREG32(ring->wptr_reg) >> ring->ptr_reg_shift;

	seq_printf(m, "wptr(0x%04x): 0x%08x [%5d]\n", ring->wptr_reg, tmp, tmp);

	tmp = RREG32(ring->rptr_reg) >> ring->ptr_reg_shift;

	seq_printf(m, "rptr(0x%04x): 0x%08x [%5d]\n", ring->rptr_reg, tmp, tmp);

	if (ring->rptr_save_reg) {

		seq_printf(m, "rptr next(0x%04x): 0x%08x\n", ring->rptr_save_reg,

			   RREG32(ring->rptr_save_reg));

	}

	seq_printf(m, "driver's copy of the wptr: 0x%08x\n", ring->wptr);

	seq_printf(m, "driver's copy of the rptr: 0x%08x\n", ring->rptr);

	seq_printf(m, "driver's copy of the wptr: 0x%08x [%5d]\n", ring->wptr, ring->wptr);

	seq_printf(m, "driver's copy of the rptr: 0x%08x [%5d]\n", ring->rptr, ring->rptr);

	seq_printf(m, "%u free dwords in ring\n", ring->ring_free_dw);

	seq_printf(m, "%u dwords in ring\n", count);

	i = ring->rptr;

	for (j = 0; j <= count; j++) {

		seq_printf(m, "r[%04d]=0x%08x\n", i, ring->ring[i]);

	/* print 8 dw before current rptr as often it's the last executed

	 * packet that is the root issue

	 */

	i = (ring->rptr + ring->ptr_mask + 1 - 32) & ring->ptr_mask;

	for (j = 0; j <= (count + 32); j++) {

		seq_printf(m, "r[%5d]=0x%08x\n", i, ring->ring[i]);

		i = (i + 1) & ring->ptr_mask;

	}

	return 0;