drm/radeon: Use TTM builtin resource manager debugfs code

Switch to using the TTM resource manager debugfs helpers. The
functionality is largely the same.
The TTM resource managers need to stay valid for as long as the
drm debugfs_root is valid.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20220412033526.369115-6-zack@kde.org
Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 44594d16611f2db26b1c4a1f4029f4161fddd1c3..d33fec488713b71c7fd45d4b452d739e7f85ee0d 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -781,17 +781,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
 
 #if defined(CONFIG_DEBUG_FS)
 
-static int radeon_mm_vram_dump_table_show(struct seq_file *m, void *unused)
-{
-       struct radeon_device *rdev = (struct radeon_device *)m->private;
-       struct ttm_resource_manager *man = ttm_manager_type(&rdev->mman.bdev,
-                                                           TTM_PL_VRAM);
-       struct drm_printer p = drm_seq_file_printer(m);
-
-       ttm_resource_manager_debug(man, &p);
-       return 0;
-}
-
 static int radeon_ttm_page_pool_show(struct seq_file *m, void *data)
 {
        struct radeon_device *rdev = (struct radeon_device *)m->private;
@@ -799,19 +788,6 @@ static int radeon_ttm_page_pool_show(struct seq_file *m, void *data)
        return ttm_pool_debugfs(&rdev->mman.bdev.pool, m);
 }
 
-static int radeon_mm_gtt_dump_table_show(struct seq_file *m, void *unused)
-{
-       struct radeon_device *rdev = (struct radeon_device *)m->private;
-       struct ttm_resource_manager *man = ttm_manager_type(&rdev->mman.bdev,
-                                                           TTM_PL_TT);
-       struct drm_printer p = drm_seq_file_printer(m);
-
-       ttm_resource_manager_debug(man, &p);
-       return 0;
-}
-
-DEFINE_SHOW_ATTRIBUTE(radeon_mm_vram_dump_table);
-DEFINE_SHOW_ATTRIBUTE(radeon_mm_gtt_dump_table);
 DEFINE_SHOW_ATTRIBUTE(radeon_ttm_page_pool);
 
 static int radeon_ttm_vram_open(struct inode *inode, struct file *filep)
@@ -930,15 +906,15 @@ static void radeon_ttm_debugfs_init(struct radeon_device *rdev)
 
        debugfs_create_file("radeon_vram", 0444, root, rdev,
                            &radeon_ttm_vram_fops);
-
        debugfs_create_file("radeon_gtt", 0444, root, rdev,
                            &radeon_ttm_gtt_fops);
-
-       debugfs_create_file("radeon_vram_mm", 0444, root, rdev,
-                           &radeon_mm_vram_dump_table_fops);
-       debugfs_create_file("radeon_gtt_mm", 0444, root, rdev,
-                           &radeon_mm_gtt_dump_table_fops);
        debugfs_create_file("ttm_page_pool", 0444, root, rdev,
                            &radeon_ttm_page_pool_fops);
+       ttm_resource_manager_create_debugfs(ttm_manager_type(&rdev->mman.bdev,
+                                                            TTM_PL_VRAM),
+                                           root, "radeon_vram_mm");
+       ttm_resource_manager_create_debugfs(ttm_manager_type(&rdev->mman.bdev,
+                                                            TTM_PL_TT),
+                                           root, "radeon_gtt_mm");
 #endif
 }