1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 8bd739cfd00d..2b3ccd850750 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -3264,10 +3264,11 @@ nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
 
         drm_connector_unregister(&mstc->connector);
 
-        drm_modeset_lock_all(drm->dev);
         drm_fb_helper_remove_one_connector(&drm->fbcon->helper, &mstc->connector);
+
+        drm_modeset_lock(&drm->dev->mode_config.connection_mutex, NULL);
         mstc->port = NULL;
-        drm_modeset_unlock_all(drm->dev);
+        drm_modeset_unlock(&drm->dev->mode_config.connection_mutex);
 
         drm_connector_unreference(&mstc->connector);
 }
@@ -3277,9 +3278,7 @@ nv50_mstm_register_connector(struct drm_connector *connector)
 {
         struct nouveau_drm *drm = nouveau_drm(connector->dev);
 
-        drm_modeset_lock_all(drm->dev);
         drm_fb_helper_add_one_connector(&drm->fbcon->helper, connector);
-        drm_modeset_unlock_all(drm->dev);
 
         drm_connector_register(connector);
 }