1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 8a604ac797aa..a12d1c7ee0e7 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -408,7 +408,10 @@ static void intel_connector_add_to_fbdev(struct intel_connector *connector)
 {
 #ifdef CONFIG_DRM_FBDEV_EMULATION
         struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
-        drm_fb_helper_add_one_connector(&dev_priv->fbdev->helper, &connector->base);
+
+        if (dev_priv->fbdev)
+                drm_fb_helper_add_one_connector(&dev_priv->fbdev->helper,
+                                                &connector->base);
 #endif
 }
 
@@ -416,7 +419,10 @@ static void intel_connector_remove_from_fbdev(struct intel_connector *connector)
 {
 #ifdef CONFIG_DRM_FBDEV_EMULATION
         struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
-        drm_fb_helper_remove_one_connector(&dev_priv->fbdev->helper, &connector->base);
+
+        if (dev_priv->fbdev)
+                drm_fb_helper_remove_one_connector(&dev_priv->fbdev->helper,
+                                                   &connector->base);
 #endif
 }