1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index d25a61739a7b..5062eec673f1 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -140,12 +140,12 @@ int drm_open(struct inode *inode, struct file *filp)
         }
         if (!retcode) {
                 mutex_lock(&dev->struct_mutex);
-                if (minor->type == DRM_MINOR_LEGACY) {
-                        if (dev->dev_mapping == NULL)
-                                dev->dev_mapping = inode->i_mapping;
-                        else if (dev->dev_mapping != inode->i_mapping)
-                                retcode = -ENODEV;
-                }
+                if (dev->dev_mapping == NULL)
+                        dev->dev_mapping = &inode->i_data;
+                /* ihold ensures nobody can remove inode with our i_data */
+                ihold(container_of(dev->dev_mapping, struct inode, i_data));
+                inode->i_mapping = dev->dev_mapping;
+                filp->f_mapping = dev->dev_mapping;
                 mutex_unlock(&dev->struct_mutex);
         }
 
@@ -509,6 +509,9 @@ int drm_release(struct inode *inode, struct file *filp)
                 }
         }
 
+        BUG_ON(dev->dev_mapping == NULL);
+        iput(container_of(dev->dev_mapping, struct inode, i_data));
+
         /* drop the reference held my the file priv */
         drm_master_put(&file_priv->master);
         file_priv->is_master = 0;