aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-05-09 09:34:51 -0400
committerDave Airlie <airlied@redhat.com>2012-05-09 12:22:33 -0400
commit711a9729337466e5ec70c418d33f4bf9fa65c38d (patch)
treea5c3ffd9089ef2668e43f86a0b70bc0e59a61a09
parenta651c55a0b489a9d5900354d487ebe34d84eec2c (diff)
drm/radeon: add sub allocator debugfs file
Dumping the current allocations. Signed-off-by: Christian König <deathsimple@vodafone.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_object.h5
-rw-r--r--drivers/gpu/drm/radeon/radeon_ring.c22
-rw-r--r--drivers/gpu/drm/radeon/radeon_sa.c14
3 files changed, 41 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h
index c120ab9e457b..d9fca1ebf77b 100644
--- a/drivers/gpu/drm/radeon/radeon_object.h
+++ b/drivers/gpu/drm/radeon/radeon_object.h
@@ -172,5 +172,10 @@ extern int radeon_sa_bo_new(struct radeon_device *rdev,
172 unsigned size, unsigned align); 172 unsigned size, unsigned align);
173extern void radeon_sa_bo_free(struct radeon_device *rdev, 173extern void radeon_sa_bo_free(struct radeon_device *rdev,
174 struct radeon_sa_bo *sa_bo); 174 struct radeon_sa_bo *sa_bo);
175#if defined(CONFIG_DEBUG_FS)
176extern void radeon_sa_bo_dump_debug_info(struct radeon_sa_manager *sa_manager,
177 struct seq_file *m);
178#endif
179
175 180
176#endif 181#endif
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 116be5e83141..f49c9c069e6b 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -601,6 +601,23 @@ static int radeon_debugfs_ib_info(struct seq_file *m, void *data)
601static struct drm_info_list radeon_debugfs_ib_list[RADEON_IB_POOL_SIZE]; 601static struct drm_info_list radeon_debugfs_ib_list[RADEON_IB_POOL_SIZE];
602static char radeon_debugfs_ib_names[RADEON_IB_POOL_SIZE][32]; 602static char radeon_debugfs_ib_names[RADEON_IB_POOL_SIZE][32];
603static unsigned radeon_debugfs_ib_idx[RADEON_IB_POOL_SIZE]; 603static unsigned radeon_debugfs_ib_idx[RADEON_IB_POOL_SIZE];
604
605static int radeon_debugfs_sa_info(struct seq_file *m, void *data)
606{
607 struct drm_info_node *node = (struct drm_info_node *) m->private;
608 struct drm_device *dev = node->minor->dev;
609 struct radeon_device *rdev = dev->dev_private;
610
611 radeon_sa_bo_dump_debug_info(&rdev->ib_pool.sa_manager, m);
612
613 return 0;
614
615}
616
617static struct drm_info_list radeon_debugfs_sa_list[] = {
618 {"radeon_sa_info", &radeon_debugfs_sa_info, 0, NULL},
619};
620
604#endif 621#endif
605 622
606int radeon_debugfs_ring_init(struct radeon_device *rdev, struct radeon_ring *ring) 623int radeon_debugfs_ring_init(struct radeon_device *rdev, struct radeon_ring *ring)
@@ -627,6 +644,11 @@ int radeon_debugfs_ib_init(struct radeon_device *rdev)
627{ 644{
628#if defined(CONFIG_DEBUG_FS) 645#if defined(CONFIG_DEBUG_FS)
629 unsigned i; 646 unsigned i;
647 int r;
648
649 r = radeon_debugfs_add_files(rdev, radeon_debugfs_sa_list, 1);
650 if (r)
651 return r;
630 652
631 for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { 653 for (i = 0; i < RADEON_IB_POOL_SIZE; i++) {
632 sprintf(radeon_debugfs_ib_names[i], "radeon_ib_%04u", i); 654 sprintf(radeon_debugfs_ib_names[i], "radeon_ib_%04u", i);
diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c
index aed0a8c68c84..1db056873b4b 100644
--- a/drivers/gpu/drm/radeon/radeon_sa.c
+++ b/drivers/gpu/drm/radeon/radeon_sa.c
@@ -193,3 +193,17 @@ void radeon_sa_bo_free(struct radeon_device *rdev, struct radeon_sa_bo *sa_bo)
193 list_del_init(&sa_bo->list); 193 list_del_init(&sa_bo->list);
194 spin_unlock(&sa_bo->manager->lock); 194 spin_unlock(&sa_bo->manager->lock);
195} 195}
196
197#if defined(CONFIG_DEBUG_FS)
198void radeon_sa_bo_dump_debug_info(struct radeon_sa_manager *sa_manager,
199 struct seq_file *m)
200{
201 struct radeon_sa_bo *i;
202
203 spin_lock(&sa_manager->lock);
204 list_for_each_entry(i, &sa_manager->sa_bo, list) {
205 seq_printf(m, "offset %08d: size %4d\n", i->offset, i->size);
206 }
207 spin_unlock(&sa_manager->lock);
208}
209#endif