1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 851a53f1acce..0d46627663b1 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -246,7 +246,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
         memset(priv, 0, sizeof(*priv));
         filp->private_data = priv;
         priv->filp = filp;
-        priv->uid = current->euid;
+        priv->uid = current_euid();
         priv->pid = task_pid_nr(current);
         priv->minor = idr_find(&drm_minors_idr, minor_id);
         priv->ioctl_count = 0;
@@ -256,6 +256,9 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 
         INIT_LIST_HEAD(&priv->lhead);
 
+        if (dev->driver->driver_features & DRIVER_GEM)
+                drm_gem_open(dev, priv);
+
         if (dev->driver->open) {
                 ret = dev->driver->open(dev, priv);
                 if (ret < 0)
@@ -400,6 +403,9 @@ int drm_release(struct inode *inode, struct file *filp)
                 dev->driver->reclaim_buffers(dev, file_priv);
         }
 
+        if (dev->driver->driver_features & DRIVER_GEM)
+                drm_gem_release(dev, file_priv);
+
         drm_fasync(-1, filp, 0);
 
         mutex_lock(&dev->ctxlist_mutex);