1 files changed, 14 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 7c8b15b22bf2..48f33be8fd0f 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -50,6 +50,7 @@ struct idr drm_minors_idr;
 
 struct class *drm_class;
 struct proc_dir_entry *drm_proc_root;
+struct dentry *drm_debugfs_root;
 
 static int drm_minor_get_id(struct drm_device *dev, int type)
 {
@@ -313,7 +314,15 @@ static int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int t
                         goto err_mem;
                 }
         } else
-                new_minor->dev_root = NULL;
+                new_minor->proc_root = NULL;
+
+#if defined(CONFIG_DEBUG_FS)
+        ret = drm_debugfs_init(new_minor, minor_id, drm_debugfs_root);
+        if (ret) {
+                DRM_ERROR("DRM: Failed to initialize /debugfs/dri.\n");
+                goto err_g2;
+        }
+#endif
 
         ret = drm_sysfs_device_add(new_minor);
         if (ret) {
@@ -451,6 +460,10 @@ int drm_put_minor(struct drm_minor **minor_p)
 
         if (minor->type == DRM_MINOR_LEGACY)
                 drm_proc_cleanup(minor, drm_proc_root);
+#if defined(CONFIG_DEBUG_FS)
+        drm_debugfs_cleanup(minor);
+#endif
+
         drm_sysfs_device_remove(minor);
 
         idr_remove(&drm_minors_idr, minor->index);