3 files changed, 21 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)
         if (!drm_is_current_master(file_priv))
                 goto out;
 
-        if (drm_core_check_feature(dev, DRIVER_LEGACY)) {
-                /*
-                 * Since the master is disappearing, so is the
-                 * possibility to lock.
-                 */
-                mutex_lock(&dev->struct_mutex);
-                if (master->lock.hw_lock) {
-                        if (dev->sigdata.lock == master->lock.hw_lock)
-                                dev->sigdata.lock = NULL;
-                        master->lock.hw_lock = NULL;
-                        master->lock.file_priv = NULL;
-                        wake_up_interruptible_all(&master->lock.lock_queue);
-                }
-                mutex_unlock(&dev->struct_mutex);
-        }
+        drm_legacy_lock_master_cleanup(dev, master);
 
         if (dev->master == file_priv->master)
                 drm_drop_master(dev, file_priv);
diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h
index 3dc626090fcb..974c2be6bcd5 100644
--- a/drivers/gpu/drm/drm_legacy.h
+++ b/drivers/gpu/drm/drm_legacy.h
@@ -126,4 +126,5 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data,
 int drm_legacy_sg_free(struct drm_device *dev, void *data,
                        struct drm_file *file_priv);
 
+void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master);
 #endif /* __DRM_LEGACY_H__ */
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 67a1a2ca7174..b70058e77a28 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -347,3 +347,22 @@ void drm_legacy_lock_release(struct drm_device *dev, struct file *filp)
                                      _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
         }
 }
+
+void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *master)
+{
+        if (!drm_core_check_feature(dev, DRIVER_LEGACY))
+                return;
+
+        /*
+         * Since the master is disappearing, so is the
+         * possibility to lock.
+         */     mutex_lock(&dev->struct_mutex);
+        if (master->lock.hw_lock) {
+                if (dev->sigdata.lock == master->lock.hw_lock)
+                        dev->sigdata.lock = NULL;
+                master->lock.hw_lock = NULL;
+                master->lock.file_priv = NULL;
+                wake_up_interruptible_all(&master->lock.lock_queue);
+        }
+        mutex_unlock(&dev->struct_mutex);
+}