1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 9b02f126fb0d..5432a1a61c15 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -232,7 +232,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
         /* if there is no current master make this fd it, but do not create
          * any master object for render clients */
         mutex_lock(&dev->struct_mutex);
-        if (!priv->minor->master && !drm_is_render_client(priv)) {
+        if (!priv->minor->master && !drm_is_render_client(priv) &&
+            !drm_is_control_client(priv)) {
                 /* create a new master */
                 priv->minor->master = drm_master_create(priv->minor);
                 if (!priv->minor->master) {
@@ -270,7 +271,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
                                 goto out_close;
                         }
                 }
-        } else if (!drm_is_render_client(priv)) {
+        } else if (!drm_is_render_client(priv) &&
+                   !drm_is_control_client(priv)) {
                 /* get a reference to the master */
                 priv->master = drm_master_get(priv->minor->master);
         }