aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Binns <frank.binns@imgtec.com>2016-06-24 13:15:15 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-07-12 07:07:20 -0400
commit0d02c4a1b1b1774a47b6e154db5194fa827accd6 (patch)
tree6250801569cec8315bb975b2be3ecce45ea4eb2f
parent83264396234d4323bb36ee1680664566e6c60376 (diff)
drm/vmwgfx: Stop checking minor type directly
Use the appropriate drm minor type helper instead. Cc: Sinclair Yeh <syeh@vmware.com> Cc: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Frank Binns <frank.binns@imgtec.com> Reviewed-by: Sinclair Yeh <syeh@vmware.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1466788520-21325-2-git-send-email-frank.binns@imgtec.com
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_drv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 60646644bef3..5d5c9515618d 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1041,8 +1041,7 @@ static struct vmw_master *vmw_master_check(struct drm_device *dev,
1041 struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv); 1041 struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv);
1042 struct vmw_master *vmaster; 1042 struct vmw_master *vmaster;
1043 1043
1044 if (file_priv->minor->type != DRM_MINOR_LEGACY || 1044 if (!drm_is_primary_client(file_priv) || !(flags & DRM_AUTH))
1045 !(flags & DRM_AUTH))
1046 return NULL; 1045 return NULL;
1047 1046
1048 ret = mutex_lock_interruptible(&dev->master_mutex); 1047 ret = mutex_lock_interruptible(&dev->master_mutex);