Commit 15997544 authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu/sa: move debugfs init into core amdgpu debugfs

In order to remove the load and unload drm callbacks,
we need to reorder the init sequence to move all the drm
debugfs file handling.  Do this for SA (sub allocator).
Tested-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a4c5b1bb
...@@ -1297,6 +1297,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) ...@@ -1297,6 +1297,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
return r; return r;
} }
if (amdgpu_debugfs_sa_init(adev)) {
dev_err(adev->dev, "failed to register debugfs file for SA\n");
}
return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list, return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list,
ARRAY_SIZE(amdgpu_debugfs_list)); ARRAY_SIZE(amdgpu_debugfs_list));
} }
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
* produce command buffers which are send to the kernel and * produce command buffers which are send to the kernel and
* put in IBs for execution by the requested ring. * put in IBs for execution by the requested ring.
*/ */
static int amdgpu_debugfs_sa_init(struct amdgpu_device *adev);
/** /**
* amdgpu_ib_get - request an IB (Indirect Buffer) * amdgpu_ib_get - request an IB (Indirect Buffer)
...@@ -295,9 +294,7 @@ int amdgpu_ib_pool_init(struct amdgpu_device *adev) ...@@ -295,9 +294,7 @@ int amdgpu_ib_pool_init(struct amdgpu_device *adev)
} }
adev->ib_pool_ready = true; adev->ib_pool_ready = true;
if (amdgpu_debugfs_sa_init(adev)) {
dev_err(adev->dev, "failed to register debugfs file for SA\n");
}
return 0; return 0;
} }
...@@ -421,7 +418,7 @@ static const struct drm_info_list amdgpu_debugfs_sa_list[] = { ...@@ -421,7 +418,7 @@ static const struct drm_info_list amdgpu_debugfs_sa_list[] = {
#endif #endif
static int amdgpu_debugfs_sa_init(struct amdgpu_device *adev) int amdgpu_debugfs_sa_init(struct amdgpu_device *adev)
{ {
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_sa_list, 1); return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_sa_list, 1);
......
...@@ -319,6 +319,7 @@ void amdgpu_sa_bo_free(struct amdgpu_device *adev, ...@@ -319,6 +319,7 @@ void amdgpu_sa_bo_free(struct amdgpu_device *adev,
void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
struct seq_file *m); struct seq_file *m);
#endif #endif
int amdgpu_debugfs_sa_init(struct amdgpu_device *adev);
bool amdgpu_bo_support_uswc(u64 bo_flags); bool amdgpu_bo_support_uswc(u64 bo_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment