drm/amdgpu: cleanup debugfs handling a bit

Remove the superflous .debugfs_init callback and register all files in
amdgpu_device.c in just one function.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index e329faa6166fd6f3dba1d1bb49c8e1eea68a5f32..c6fc67f75ffae4c901648091c1108f2f84dcad60 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1250,11 +1250,6 @@ int amdgpu_debugfs_add_files(struct amdgpu_device *adev,
                             const struct drm_info_list *files,
                             unsigned nfiles);
 int amdgpu_debugfs_fence_init(struct amdgpu_device *adev);
-
-#if defined(CONFIG_DEBUG_FS)
-int amdgpu_debugfs_init(struct drm_minor *minor);
-#endif
-
 int amdgpu_debugfs_firmware_init(struct amdgpu_device *adev);
 
 /*

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 98cc4df02b14e0abd6b3b5d5d03d414b7c3c7768..345663a784ae253a8dd5f68abc3a34814483ca3f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -66,8 +66,7 @@ MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin");
 
 static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);
 static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev);
-static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev);
-static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev);
+static int amdgpu_debugfs_init(struct amdgpu_device *adev);
 
 static const char *amdgpu_asic_name[] = {
        "TAHITI",
@@ -2405,17 +2404,13 @@ int amdgpu_device_init(struct amdgpu_device *adev,
        if (r)
                DRM_ERROR("registering register debugfs failed (%d).\n", r);
 
-       r = amdgpu_debugfs_test_ib_ring_init(adev);
-       if (r)
-               DRM_ERROR("registering register test ib ring debugfs failed (%d).\n", r);
-
        r = amdgpu_debugfs_firmware_init(adev);
        if (r)
                DRM_ERROR("registering firmware debugfs failed (%d).\n", r);
 
-       r = amdgpu_debugfs_vbios_dump_init(adev);
+       r = amdgpu_debugfs_init(adev);
        if (r)
-               DRM_ERROR("Creating vbios dump debugfs failed (%d).\n", r);
+               DRM_ERROR("Creating debugfs files failed (%d).\n", r);
 
        if ((amdgpu_testing & 1)) {
                if (adev->accel_working)
@@ -3964,21 +3959,6 @@ static int amdgpu_debugfs_test_ib(struct seq_file *m, void *data)
        return 0;
 }
 
-static const struct drm_info_list amdgpu_debugfs_test_ib_ring_list[] = {
-       {"amdgpu_test_ib", &amdgpu_debugfs_test_ib}
-};
-
-static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev)
-{
-       return amdgpu_debugfs_add_files(adev,
-                                       amdgpu_debugfs_test_ib_ring_list, 1);
-}
-
-int amdgpu_debugfs_init(struct drm_minor *minor)
-{
-       return 0;
-}
-
 static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data)
 {
        struct drm_info_node *node = (struct drm_info_node *) m->private;
@@ -3989,19 +3969,19 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data)
        return 0;
 }
 
-static const struct drm_info_list amdgpu_vbios_dump_list[] = {
-               {"amdgpu_vbios",
-                amdgpu_debugfs_get_vbios_dump,
-                0, NULL},
+static const struct drm_info_list amdgpu_debugfs_list[] = {
+       {"amdgpu_vbios", amdgpu_debugfs_get_vbios_dump},
+       {"amdgpu_test_ib", &amdgpu_debugfs_test_ib}
 };
 
-static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev)
+static int amdgpu_debugfs_init(struct amdgpu_device *adev)
 {
-       return amdgpu_debugfs_add_files(adev,
-                                       amdgpu_vbios_dump_list, 1);
+       return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list,
+                                       ARRAY_SIZE(amdgpu_debugfs_list));
 }
+
 #else
-static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev)
+static int amdgpu_debugfs_init(struct amdgpu_device *adev)
 {
        return 0;
 }
@@ -4009,9 +3989,5 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev)
 {
        return 0;
 }
-static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev)
-{
-       return 0;
-}
 static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev) { }
 #endif

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 51b76688ab90f4d3075dbcabd6fca700245ba705..0b039bdcf84e914f589b7976feccc6c4f474b161 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -850,9 +850,6 @@ static struct drm_driver kms_driver = {
        .disable_vblank = amdgpu_disable_vblank_kms,
        .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,
        .get_scanout_position = amdgpu_get_crtc_scanout_position,
-#if defined(CONFIG_DEBUG_FS)
-       .debugfs_init = amdgpu_debugfs_init,
-#endif
        .irq_preinstall = amdgpu_irq_preinstall,
        .irq_postinstall = amdgpu_irq_postinstall,
        .irq_uninstall = amdgpu_irq_uninstall,