drm/file: Don't set master on in-kernel clients

It only makes sense for userspace clients.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180618141739.48151-3-noralf@tronnes.org

diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
index c0410b8330436c69f7d2d2ad7ff16e7c48502f1e..66bb403dc8abb5fad126c1f20679a41f96ef655a 100644 (file)
--- a/drivers/gpu/drm/drm_file.c
+++ b/drivers/gpu/drm/drm_file.c
@@ -155,17 +155,8 @@ struct drm_file *drm_file_alloc(struct drm_minor *minor)
                        goto out_prime_destroy;
        }
 
-       if (drm_is_primary_client(file)) {
-               ret = drm_master_open(file);
-               if (ret)
-                       goto out_close;
-       }
-
        return file;
 
-out_close:
-       if (dev->driver->postclose)
-               dev->driver->postclose(dev, file);
 out_prime_destroy:
        if (drm_core_check_feature(dev, DRIVER_PRIME))
                drm_prime_destroy_file_private(&file->prime);
@@ -365,6 +356,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
 {
        struct drm_device *dev = minor->dev;
        struct drm_file *priv;
+       int ret;
 
        if (filp->f_flags & O_EXCL)
                return -EBUSY;  /* No exclusive opens */
@@ -379,6 +371,14 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
        if (IS_ERR(priv))
                return PTR_ERR(priv);
 
+       if (drm_is_primary_client(priv)) {
+               ret = drm_master_open(priv);
+               if (ret) {
+                       drm_file_free(priv);
+                       return ret;
+               }
+       }
+
        filp->private_data = priv;
        filp->f_mode |= FMODE_UNSIGNED_OFFSET;
        priv->filp = filp;