Commit 3f5cea67 authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu/gem: 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 gem.
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 24038d58
...@@ -1304,6 +1304,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) ...@@ -1304,6 +1304,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
if (amdgpu_debugfs_fence_init(adev)) if (amdgpu_debugfs_fence_init(adev))
dev_err(adev->dev, "fence debugfs file creation failed\n"); dev_err(adev->dev, "fence debugfs file creation failed\n");
r = amdgpu_debugfs_gem_init(adev);
if (r)
DRM_ERROR("registering gem debugfs failed (%d).\n", r);
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));
} }
......
...@@ -3120,10 +3120,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, ...@@ -3120,10 +3120,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
} else } else
adev->ucode_sysfs_en = true; adev->ucode_sysfs_en = true;
r = amdgpu_debugfs_gem_init(adev);
if (r)
DRM_ERROR("registering gem debugfs failed (%d).\n", r);
r = amdgpu_debugfs_regs_init(adev); r = amdgpu_debugfs_regs_init(adev);
if (r) if (r)
DRM_ERROR("registering register debugfs failed (%d).\n", r); DRM_ERROR("registering register debugfs failed (%d).\n", r);
......
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