5 files changed, 12 insertions, 9 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 0ef269053751..e5aaae3f8e19 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3730,7 +3730,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
                         fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
         }
 
-        intel_panel_init(&intel_connector->panel, fixed_mode);
+        intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
         intel_panel_setup_backlight(connector);
 
         return true;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index aff9171a91d8..3599d93caad4 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -823,7 +823,8 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
 
 /* intel_panel.c */
 int intel_panel_init(struct intel_panel *panel,
-                     struct drm_display_mode *fixed_mode);
+                     struct drm_display_mode *fixed_mode,
+                     struct drm_display_mode *downclock_mode);
 void intel_panel_fini(struct intel_panel *panel);
 void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
                             struct drm_display_mode *adjusted_mode);
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index fabbf0d895cf..6bffbdf149a8 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -624,7 +624,7 @@ bool intel_dsi_init(struct drm_device *dev)
         }
 
         fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
-        intel_panel_init(&intel_connector->panel, fixed_mode);
+        intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
 
         return true;
 
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 3f3043b4ff26..6341a8873d28 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -899,6 +899,7 @@ void intel_lvds_init(struct drm_device *dev)
         struct drm_encoder *encoder;
         struct drm_display_mode *scan; /* *modes, *bios_mode; */
         struct drm_display_mode *fixed_mode = NULL;
+        struct drm_display_mode *downclock_mode = NULL;
         struct edid *edid;
         struct drm_crtc *crtc;
         u32 lvds;
@@ -1032,15 +1033,14 @@ void intel_lvds_init(struct drm_device *dev)
 
                         fixed_mode = drm_mode_duplicate(dev, scan);
                         if (fixed_mode) {
-                                intel_connector->panel.downclock_mode =
+                                downclock_mode =
                                         intel_find_panel_downclock(dev,
                                         fixed_mode, connector);
-                                if (intel_connector->panel.downclock_mode !=
-                                        NULL && i915.lvds_downclock) {
+                                if (downclock_mode != NULL &&
+                                        i915.lvds_downclock) {
                                         /* We found the downclock for LVDS. */
                                         dev_priv->lvds_downclock_avail = true;
                                         dev_priv->lvds_downclock =
-                                                intel_connector->panel.
                                                 downclock_mode->clock;
                                         DRM_DEBUG_KMS("LVDS downclock is found"
                                         " in EDID. Normal clock %dKhz, "
@@ -1116,7 +1116,7 @@ out:
         }
         drm_sysfs_connector_add(connector);
 
-        intel_panel_init(&intel_connector->panel, fixed_mode);
+        intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
         intel_panel_setup_backlight(connector);
 
         return;
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index f1ee2c4d282e..5bc3f6ea1014 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1190,9 +1190,11 @@ void intel_panel_init_backlight_funcs(struct drm_device *dev)
 }
 
 int intel_panel_init(struct intel_panel *panel,
-                     struct drm_display_mode *fixed_mode)
+                     struct drm_display_mode *fixed_mode,
+                     struct drm_display_mode *downclock_mode)
 {
         panel->fixed_mode = fixed_mode;
+        panel->downclock_mode = downclock_mode;
 
         return 0;
 }