3 files changed, 4 insertions, 5 deletions

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 1f82dccfcd58..ca2de043b9ce 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1496,7 +1496,8 @@ void intel_gmch_panel_fitting(struct intel_crtc *crtc,
                               int fitting_mode);
 void intel_panel_set_backlight_acpi(struct intel_connector *connector,
                                     u32 level, u32 max);
-int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe);
+int intel_panel_setup_backlight(struct drm_connector *connector,
+                                enum pipe pipe);
 void intel_panel_enable_backlight(struct intel_connector *connector);
 void intel_panel_disable_backlight(struct intel_connector *connector);
 void intel_panel_destroy_backlight(struct drm_connector *connector);
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index b444d0e35a98..ae2dcaf1b52e 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1587,13 +1587,12 @@ void intel_dsi_init(struct drm_device *dev)
         connector->display_info.height_mm = fixed_mode->height_mm;
 
         intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
+        intel_panel_setup_backlight(connector, INVALID_PIPE);
 
         intel_dsi_add_properties(intel_connector);
 
         drm_connector_register(connector);
 
-        intel_panel_setup_backlight(connector, INVALID_PIPE);
-
         return;
 
 err:
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 935b53642948..6306c5499587 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1120,6 +1120,7 @@ out:
         mutex_unlock(&dev->mode_config.mutex);
 
         intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
+        intel_panel_setup_backlight(connector, INVALID_PIPE);
 
         lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
         DRM_DEBUG_KMS("detected %s-link lvds configuration\n",
@@ -1134,8 +1135,6 @@ out:
         }
         drm_connector_register(connector);
 
-        intel_panel_setup_backlight(connector, INVALID_PIPE);
-
         return;
 
 failed: