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

Commit af9720f4 authored by Christian König's avatar Christian König Committed by Dave Airlie
Browse files

drm/radeon: move ring debugfs into radeon_ring.c 



Those debugfs files aren't r600 specific, so they
shouldn't be in r600.c. Move them to radeon_ring.c
and also add functionality to dump CP1 & CP2 ring
informations.

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e32eb50d

drivers/gpu/drm/radeon/r600.c

+0 −26
Original line number Diff line number Diff line
@@ -3513,31 +3513,6 @@ restart_ih: 
 */

#if defined(CONFIG_DEBUG_FS)



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;

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

	unsigned count, i, j;



	radeon_ring_free_size(rdev, ring);

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

	seq_printf(m, "CP_STAT 0x%08x\n", RREG32(CP_STAT));

	seq_printf(m, "CP_RB_WPTR 0x%08x\n", RREG32(CP_RB_WPTR));

	seq_printf(m, "CP_RB_RPTR 0x%08x\n", RREG32(CP_RB_RPTR));

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

	seq_printf(m, "driver's copy of the CP_RB_RPTR 0x%08x\n", 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]);

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

	}

	return 0;

}



static int r600_debugfs_mc_info(struct seq_file *m, void *data)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;
@@ -3551,7 +3526,6 @@ static int r600_debugfs_mc_info(struct seq_file *m, void *data) 


static struct drm_info_list r600_mc_info_list[] = {

	{"r600_mc_info", r600_debugfs_mc_info, 0, NULL},

	{"r600_ring_info", r600_debugfs_cp_ring_info, 0, NULL},

};

#endif

drivers/gpu/drm/radeon/radeon_ring.c

+50 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "atom.h"



int radeon_debugfs_ib_init(struct radeon_device *rdev);

int radeon_debugfs_ring_init(struct radeon_device *rdev);



u32 radeon_get_ib_value(struct radeon_cs_parser *p, int idx)

{
@@ -252,6 +253,9 @@ int radeon_ib_pool_init(struct radeon_device *rdev) 
	if (radeon_debugfs_ib_init(rdev)) {

		DRM_ERROR("Failed to register debugfs file for IB !\n");

	}

	if (radeon_debugfs_ring_init(rdev)) {

		DRM_ERROR("Failed to register debugfs file for rings !\n");

	}

	return r;

}
@@ -444,6 +448,42 @@ void radeon_ring_fini(struct radeon_device *rdev, struct radeon_ring *ring) 
 * Debugfs info

 */

#if defined(CONFIG_DEBUG_FS)



static int radeon_debugfs_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;

	int ridx = *(int*)node->info_ent->data;

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

	unsigned count, i, j;



	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));

	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, "%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]);

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

	}

	return 0;

}



static int radeon_ring_type_gfx_index = RADEON_RING_TYPE_GFX_INDEX;

static int cayman_ring_type_cp1_index = CAYMAN_RING_TYPE_CP1_INDEX;

static int cayman_ring_type_cp2_index = CAYMAN_RING_TYPE_CP2_INDEX;



static struct drm_info_list radeon_debugfs_ring_info_list[] = {

	{"radeon_ring_gfx", radeon_debugfs_ring_info, 0, &radeon_ring_type_gfx_index},

	{"radeon_ring_cp1", radeon_debugfs_ring_info, 0, &cayman_ring_type_cp1_index},

	{"radeon_ring_cp2", radeon_debugfs_ring_info, 0, &cayman_ring_type_cp2_index},

};



static int radeon_debugfs_ib_info(struct seq_file *m, void *data)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;
@@ -495,6 +535,16 @@ static struct drm_info_list radeon_debugfs_ib_bogus_info_list[] = { 
};

#endif



int radeon_debugfs_ring_init(struct radeon_device *rdev)

{

#if defined(CONFIG_DEBUG_FS)

	return radeon_debugfs_add_files(rdev, radeon_debugfs_ring_info_list,

					ARRAY_SIZE(radeon_debugfs_ring_info_list));

#else

	return 0;

#endif

}



int radeon_debugfs_ib_init(struct radeon_device *rdev)

{

#if defined(CONFIG_DEBUG_FS)