--- ../linux-4.13.11-gentoo/drivers/gpu/drm/nouveau/nv50_display.c	2017-11-06 18:10:34.000000000 +0100
+++ drivers/gpu/drm/nouveau/nv50_display.c	2017-11-08 13:08:14.240875120 +0100
@@ -3233,7 +3233,10 @@
 	drm_connector_unregister(&mstc->connector);
 
 	drm_modeset_lock_all(drm->dev);
-	drm_fb_helper_remove_one_connector(&drm->fbcon->helper, &mstc->connector);
+	if (drm->fbcon)
+	{
+	    drm_fb_helper_remove_one_connector(&drm->fbcon->helper, &mstc->connector);
+	}
 	mstc->port = NULL;
 	drm_modeset_unlock_all(drm->dev);
 
@@ -3246,7 +3249,10 @@
 	struct nouveau_drm *drm = nouveau_drm(connector->dev);
 
 	drm_modeset_lock_all(drm->dev);
-	drm_fb_helper_add_one_connector(&drm->fbcon->helper, connector);
+	if (drm->fbcon)
+	{
+	    drm_fb_helper_add_one_connector(&drm->fbcon->helper, connector);
+	}
 	drm_modeset_unlock_all(drm->dev);
 
 	drm_connector_register(connector);