Commit cd9e29e7 authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu/firmware: 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 firmware.
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 f9d64e6c
...@@ -1312,6 +1312,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) ...@@ -1312,6 +1312,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
if (r) if (r)
DRM_ERROR("registering register debugfs failed (%d).\n", r); DRM_ERROR("registering register debugfs failed (%d).\n", r);
r = amdgpu_debugfs_firmware_init(adev);
if (r)
DRM_ERROR("registering firmware 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_firmware_init(adev);
if (r)
DRM_ERROR("registering firmware debugfs failed (%d).\n", r);
r = amdgpu_debugfs_init(adev); r = amdgpu_debugfs_init(adev);
if (r) if (r)
DRM_ERROR("Creating debugfs files failed (%d).\n", r); DRM_ERROR("Creating debugfs files 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