[PATCH] drm/amdgpu: don't add files at control minor debugfs directory

[Nicolai Stange]

Since commit 8a357d10043c ("drm: Nerf DRM_CONTROL nodes"), a
struct drm_device's ->control member is always NULL.

In the case of CONFIG_DEBUG_FS=y, amdgpu_debugfs_add_files() accesses
->control->debugfs_root though. This results in a NULL pointer
dereference.

Fix this by omitting the drm_debugfs_create_files() call for the
control minor debugfs directory which is now non-existent anyway.

Fixes: 8a357d10043c ("drm: Nerf DRM_CONTROL nodes")
Signed-off-by: Nicolai Stange <nicstange at gmail.com>
---
Applicable to next-20161202. Compile-only tested.

 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index deee2db..0cb3e82 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2493,9 +2493,6 @@ int amdgpu_debugfs_add_files(struct amdgpu_device *adev,
        adev->debugfs_count = i;
 #if defined(CONFIG_DEBUG_FS)
        drm_debugfs_create_files(files, nfiles,
-                                adev->ddev->control->debugfs_root,
-                                adev->ddev->control);
-       drm_debugfs_create_files(files, nfiles,
                                 adev->ddev->primary->debugfs_root,
                                 adev->ddev->primary);
 #endif
@@ -2510,9 +2507,6 @@ static void amdgpu_debugfs_remove_files(struct 
amdgpu_device *adev)
        for (i = 0; i < adev->debugfs_count; i++) {
                drm_debugfs_remove_files(adev->debugfs[i].files,
                                         adev->debugfs[i].num_files,
-                                        adev->ddev->control);
-               drm_debugfs_remove_files(adev->debugfs[i].files,
-                                        adev->debugfs[i].num_files,
                                         adev->ddev->primary);
        }
 #endif
-- 
2.10.2