--- nouveau_connector.c	2015-11-13 04:14:42.528044189 -0600
+++ /mnt/backup/root/usr/src/linux/drivers/gpu/drm/nouveau/nouveau_connector.c	2015-11-12 17:41:06.000000000 -0600
@@ -1274,7 +1274,6 @@
 		break;
 	}
 
-	drm_modeset_lock_all(dev);
 	ret = nvif_notify_init(&disp->disp, nouveau_connector_hotplug, true,
 			       NV04_DISP_NTFY_CONN,
 			       &(struct nvif_notify_conn_req_v0) {
@@ -1284,7 +1283,6 @@
 			       sizeof(struct nvif_notify_conn_req_v0),
 			       sizeof(struct nvif_notify_conn_rep_v0),
 			       &nv_connector->hpd);
-	drm_modeset_unlock_all(dev);
 	if (ret)
 		connector->polled = DRM_CONNECTOR_POLL_CONNECT;
 	else