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: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index 444a07287f9807cd63a243bbb9538976d93413e4..6dbc312d946533934e5eea5f1cf3c0f908ffe23c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -1312,6 +1312,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
        if (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,
                                        ARRAY_SIZE(amdgpu_debugfs_list));
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index d74ad2a2a3968e215faed53430e0a098f47d6a3c..008797c7a5848500d1698c2b7c96e3ac93f9b353 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3120,10 +3120,6 @@ fence_driver_init:
        } else
                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);
        if (r)
                DRM_ERROR("Creating debugfs files failed (%d).\n", r);