drm: Extract drm_is_current_master

[cascardo/linux.git] / drivers / gpu / drm / vmwgfx / vmwgfx_drv.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 9fcd820..6064664 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1049,7 +1049,7 @@ static struct vmw_master *vmw_master_check(struct drm_device *dev,
        if (unlikely(ret != 0))
                return ERR_PTR(-ERESTARTSYS);
 
-       if (file_priv->is_master) {
+       if (drm_is_current_master(file_priv)) {
                mutex_unlock(&dev->master_mutex);
                return NULL;
        }
@@ -1228,8 +1228,7 @@ static int vmw_master_set(struct drm_device *dev,
 }
 
 static void vmw_master_drop(struct drm_device *dev,
-                           struct drm_file *file_priv,
-                           bool from_release)
+                           struct drm_file *file_priv)
 {
        struct vmw_private *dev_priv = vmw_priv(dev);
        struct vmw_fpriv *vmw_fp = vmw_fpriv(file_priv);