aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_auth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/drm_auth.c')
-rw-r--r--drivers/gpu/drm/drm_auth.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
index 1669c42c40ed..ee969e9de472 100644
--- a/drivers/gpu/drm/drm_auth.c
+++ b/drivers/gpu/drm/drm_auth.c
@@ -274,21 +274,7 @@ void drm_master_release(struct drm_file *file_priv)
274 if (!drm_is_current_master(file_priv)) 274 if (!drm_is_current_master(file_priv))
275 goto out; 275 goto out;
276 276
277 if (drm_core_check_feature(dev, DRIVER_LEGACY)) { 277 drm_legacy_lock_master_cleanup(dev, master);
278 /*
279 * Since the master is disappearing, so is the
280 * possibility to lock.
281 */
282 mutex_lock(&dev->struct_mutex);
283 if (master->lock.hw_lock) {
284 if (dev->sigdata.lock == master->lock.hw_lock)
285 dev->sigdata.lock = NULL;
286 master->lock.hw_lock = NULL;
287 master->lock.file_priv = NULL;
288 wake_up_interruptible_all(&master->lock.lock_queue);
289 }
290 mutex_unlock(&dev->struct_mutex);
291 }
292 278
293 if (dev->master == file_priv->master) 279 if (dev->master == file_priv->master)
294 drm_drop_master(dev, file_priv); 280 drm_drop_master(dev, file_priv);