--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c 
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c 
@@ -422,6 +422,9 @@ int amdgpu_debugfs_ring_init(struct amdgpu_device *adev,
 	struct dentry *ent, *root = minor->debugfs_root;
 	char name[32];
 
+if (IS_ERR(root))
+		return 0;
+
 	sprintf(name, "amdgpu_ring_%s", ring->name);
 
 	ent = debugfs_create_file(name,
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -2382,6 +2382,8 @@ void amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)
 	struct drm_minor *minor = adev_to_drm(adev)->primary;
 	struct dentry *root = minor->debugfs_root;
 
+	if (IS_ERR(root))
+		return;
 	debugfs_create_file_size("amdgpu_vram", 0444, root, adev,
 				 &amdgpu_ttm_vram_fops, adev->gmc.mc_vram_size);
 	debugfs_create_file("amdgpu_iomem", 0444, root, adev,