1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 8bcb93a2a9f6..f1ecf916474a 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -848,8 +848,8 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         /* use the module option value if specified */
-        if (i915_lvds_channel_mode > 0)
-                return i915_lvds_channel_mode == 2;
+        if (i915.lvds_channel_mode > 0)
+                return i915.lvds_channel_mode == 2;
 
         if (dmi_check_system(intel_dual_link_lvds))
                 return true;
@@ -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;
@@ -957,11 +958,12 @@ void intel_lvds_init(struct drm_device *dev)
         intel_encoder->get_hw_state = intel_lvds_get_hw_state;
         intel_encoder->get_config = intel_lvds_get_config;
         intel_connector->get_hw_state = intel_connector_get_hw_state;
+        intel_connector->unregister = intel_connector_unregister;
 
         intel_connector_attach_encoder(intel_connector, intel_encoder);
         intel_encoder->type = INTEL_OUTPUT_LVDS;
 
-        intel_encoder->cloneable = false;
+        intel_encoder->cloneable = 0;
         if (HAS_PCH_SPLIT(dev))
                 intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
         else if (IS_GEN4(dev))
@@ -1000,6 +1002,7 @@ void intel_lvds_init(struct drm_device *dev)
          * Attempt to get the fixed panel mode from DDC.  Assume that the
          * preferred mode is the right one.
          */
+        mutex_lock(&dev->mode_config.mutex);
         edid = drm_get_edid(connector, intel_gmbus_get_adapter(dev_priv, pin));
         if (edid) {
                 if (drm_add_edid_modes(connector, edid)) {
@@ -1032,15 +1035,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, "
@@ -1094,6 +1096,8 @@ void intel_lvds_init(struct drm_device *dev)
                 goto failed;
 
 out:
+        mutex_unlock(&dev->mode_config.mutex);
+
         lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
         DRM_DEBUG_KMS("detected %s-link lvds configuration\n",
                       lvds_encoder->is_dual_link ? "dual" : "single");
@@ -1116,17 +1120,17 @@ 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;
 
 failed:
+        mutex_unlock(&dev->mode_config.mutex);
+
         DRM_DEBUG_KMS("No LVDS modes found, disabling.\n");
         drm_connector_cleanup(connector);
         drm_encoder_cleanup(encoder);
-        if (fixed_mode)
-                drm_mode_destroy(dev, fixed_mode);
         kfree(lvds_encoder);
         kfree(lvds_connector);
         return;