Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next

Fixes for 4.20.  Highlights:
- VCN DPG fixes for Picasso
- Add support for the latest vega20 vbios
- Scheduler timeout fix
- License fixes for radeon and amdgpu
- Misc other fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181017215427.2804-1-alexander.deucher@amd.com

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index f5fb93795a69..dd9a4fb9ce39 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -826,21 +826,13 @@ int amdgpu_debugfs_regs_init(struct amdgpu_device *adev)
 {
         struct drm_minor *minor = adev->ddev->primary;
         struct dentry *ent, *root = minor->debugfs_root;
-        unsigned i, j;
+        unsigned int i;
 
         for (i = 0; i < ARRAY_SIZE(debugfs_regs); i++) {
                 ent = debugfs_create_file(debugfs_regs_names[i],
                                           S_IFREG | S_IRUGO, root,
                                           adev, debugfs_regs[i]);
-                if (IS_ERR(ent)) {
-                        for (j = 0; j < i; j++) {
-                                debugfs_remove(adev->debugfs_regs[i]);
-                                adev->debugfs_regs[i] = NULL;
-                        }
-                        return PTR_ERR(ent);
-                }
-
-                if (!i)
+                if (!i && !IS_ERR_OR_NULL(ent))
                         i_size_write(ent->d_inode, adev->rmmio_size);
                 adev->debugfs_regs[i] = ent;
         }