diff mbox

[1/6] drm/vmwgfx: Stop checking minor type directly

Message ID 1466788520-21325-2-git-send-email-frank.binns@imgtec.com (mailing list archive)
State New, archived
Headers show

Commit Message

Frank Binns June 24, 2016, 5:15 p.m. UTC 
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>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Sinclair Yeh June 24, 2016, 10:46 p.m. UTC | #1 
Thanks!

Reviewed-by: Sinclair Yeh <syeh@vmware.com>


On Fri, Jun 24, 2016 at 06:15:15PM +0100, Frank Binns wrote:
> 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>
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> index 6064664..5d5c951 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,
>  	struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv);
>  	struct vmw_master *vmaster;
>  
> -	if (file_priv->minor->type != DRM_MINOR_LEGACY ||
> -	    !(flags & DRM_AUTH))
> +	if (!drm_is_primary_client(file_priv) || !(flags & DRM_AUTH))
>  		return NULL;
>  
>  	ret = mutex_lock_interruptible(&dev->master_mutex);
> -- 
> 2.7.4
>
Daniel Vetter July 12, 2016, 11:08 a.m. UTC | #2 
On Fri, Jun 24, 2016 at 03:46:25PM -0700, Sinclair Yeh wrote:
> Thanks!
> 
> Reviewed-by: Sinclair Yeh <syeh@vmware.com>

Applied to drm-misc.
-Daniel

> 
> 
> On Fri, Jun 24, 2016 at 06:15:15PM +0100, Frank Binns wrote:
> > 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>
> > ---
> >  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> > index 6064664..5d5c951 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,
> >  	struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv);
> >  	struct vmw_master *vmaster;
> >  
> > -	if (file_priv->minor->type != DRM_MINOR_LEGACY ||
> > -	    !(flags & DRM_AUTH))
> > +	if (!drm_is_primary_client(file_priv) || !(flags & DRM_AUTH))
> >  		return NULL;
> >  
> >  	ret = mutex_lock_interruptible(&dev->master_mutex);
> > -- 
> > 2.7.4
> > 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 6064664..5d5c951 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,
 	struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv);
 	struct vmw_master *vmaster;
 
-	if (file_priv->minor->type != DRM_MINOR_LEGACY ||
-	    !(flags & DRM_AUTH))
+	if (!drm_is_primary_client(file_priv) || !(flags & DRM_AUTH))
 		return NULL;
 
 	ret = mutex_lock_interruptible(&dev->master_mutex);