UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/radeon: cleanup debugfs 

Remove unnecessary debugfs dentries and also radeon_ttm_debugfs_fini()
as drm_debugfs_cleanup() will recursively remove debugfs files.

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Nirmoy Das 2021-02-10 16:19:20 +01:00 committed by Alex Deucher
parent 88293c03c8
commit ba3d9406a0
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/radeon/radeon.h
View File

@ -453,11 +453,6 @@ struct radeon_surface_reg {
struct radeon_mman {
struct ttm_bo_device bdev;
bool initialized;
#if defined(CONFIG_DEBUG_FS)
struct dentry *vram;
struct dentry *gtt;
#endif
};
struct radeon_bo_list {

24
drivers/gpu/drm/radeon/radeon_ttm.c
View File

@ -53,7 +53,6 @@
#include "radeon_ttm.h"
static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
static void radeon_ttm_debugfs_fini(struct radeon_device *rdev);
static int radeon_ttm_tt_bind(struct ttm_bo_device *bdev,
struct ttm_tt *ttm,
@ -777,7 +776,7 @@ void radeon_ttm_fini(struct radeon_device *rdev)
if (!rdev->mman.initialized)
return;
radeon_ttm_debugfs_fini(rdev);
if (rdev->stolen_vga_memory) {
r = radeon_bo_reserve(rdev->stolen_vga_memory, false);
if (r == 0) {
@ -1010,12 +1009,11 @@ static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
struct drm_minor *minor = rdev->ddev->primary;
struct dentry *root = minor->debugfs_root;
rdev->mman.vram = debugfs_create_file("radeon_vram", S_IFREG | S_IRUGO,
root, rdev,
&radeon_ttm_vram_fops);
debugfs_create_file("radeon_vram", S_IFREG | S_IRUGO, root, rdev,
&radeon_ttm_vram_fops);
rdev->mman.gtt = debugfs_create_file("radeon_gtt", S_IFREG | S_IRUGO,
root, rdev, &radeon_ttm_gtt_fops);
debugfs_create_file("radeon_gtt", S_IFREG | S_IRUGO, root, rdev,
&radeon_ttm_gtt_fops);
count = ARRAY_SIZE(radeon_ttm_debugfs_list);
@ -1025,15 +1023,3 @@ static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
return 0;
#endif
}
static void radeon_ttm_debugfs_fini(struct radeon_device *rdev)
{
#if defined(CONFIG_DEBUG_FS)
debugfs_remove(rdev->mman.vram);
rdev->mman.vram = NULL;
debugfs_remove(rdev->mman.gtt);
rdev->mman.gtt = NULL;
#endif
}