1 files changed, 26 insertions, 25 deletions

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index e9082185a375..49550470483e 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -72,7 +72,7 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder,
                                     enum pipe *pipe)
 {
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
         enum intel_display_power_domain power_domain;
         u32 tmp;
@@ -106,7 +106,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,
                                   struct intel_crtc_state *pipe_config)
 {
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
         u32 tmp, flags = 0;
 
@@ -140,7 +140,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)
 {
         struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
         struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
         const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
         int pipe = crtc->pipe;
@@ -184,8 +184,8 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)
          * panels behave in the two modes. For now, let's just maintain the
          * value we got from the BIOS.
          */
-         temp &= ~LVDS_A3_POWER_MASK;
-         temp |= lvds_encoder->a3_power;
+        temp &= ~LVDS_A3_POWER_MASK;
+        temp |= lvds_encoder->a3_power;
 
         /* Set the dithering flag on LVDS as needed, note that there is no
          * special lvds dither control bit on pch-split platforms, dithering is
@@ -216,7 +216,7 @@ static void intel_enable_lvds(struct intel_encoder *encoder)
         struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
         struct intel_connector *intel_connector =
                 &lvds_encoder->attached_connector->base;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         i915_reg_t ctl_reg, stat_reg;
 
         if (HAS_PCH_SPLIT(dev)) {
@@ -231,7 +231,7 @@ static void intel_enable_lvds(struct intel_encoder *encoder)
 
         I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON);
         POSTING_READ(lvds_encoder->reg);
-        if (wait_for((I915_READ(stat_reg) & PP_ON) != 0, 1000))
+        if (intel_wait_for_register(dev_priv, stat_reg, PP_ON, PP_ON, 1000))
                 DRM_ERROR("timed out waiting for panel to power on\n");
 
         intel_panel_enable_backlight(intel_connector);
@@ -241,7 +241,7 @@ static void intel_disable_lvds(struct intel_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
         struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         i915_reg_t ctl_reg, stat_reg;
 
         if (HAS_PCH_SPLIT(dev)) {
@@ -253,7 +253,7 @@ static void intel_disable_lvds(struct intel_encoder *encoder)
         }
 
         I915_WRITE(ctl_reg, I915_READ(ctl_reg) & ~POWER_TARGET_ON);
-        if (wait_for((I915_READ(stat_reg) & PP_ON) == 0, 1000))
+        if (intel_wait_for_register(dev_priv, stat_reg, PP_ON, 0, 1000))
                 DRM_ERROR("timed out waiting for panel to power off\n");
 
         I915_WRITE(lvds_encoder->reg, I915_READ(lvds_encoder->reg) & ~LVDS_PORT_EN);
@@ -442,7 +442,7 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
                 container_of(nb, struct intel_lvds_connector, lid_notifier);
         struct drm_connector *connector = &lvds_connector->base.base;
         struct drm_device *dev = connector->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         if (dev->switch_power_state != DRM_SWITCH_POWER_ON)
                 return NOTIFY_OK;
@@ -555,6 +555,7 @@ static const struct drm_connector_funcs intel_lvds_connector_funcs = {
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_lvds_set_property,
         .atomic_get_property = intel_connector_atomic_get_property,
+        .late_register = intel_connector_register,
         .early_unregister = intel_connector_unregister,
         .destroy = intel_lvds_destroy,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
@@ -810,27 +811,29 @@ static const struct dmi_system_id intel_dual_link_lvds[] = {
         { }     /* terminating entry */
 };
 
-bool intel_is_dual_link_lvds(struct drm_device *dev)
+struct intel_encoder *intel_get_lvds_encoder(struct drm_device *dev)
 {
-        struct intel_encoder *encoder;
-        struct intel_lvds_encoder *lvds_encoder;
+        struct intel_encoder *intel_encoder;
 
-        for_each_intel_encoder(dev, encoder) {
-                if (encoder->type == INTEL_OUTPUT_LVDS) {
-                        lvds_encoder = to_lvds_encoder(&encoder->base);
+        for_each_intel_encoder(dev, intel_encoder)
+                if (intel_encoder->type == INTEL_OUTPUT_LVDS)
+                        return intel_encoder;
 
-                        return lvds_encoder->is_dual_link;
-                }
-        }
+        return NULL;
+}
 
-        return false;
+bool intel_is_dual_link_lvds(struct drm_device *dev)
+{
+        struct intel_encoder *encoder = intel_get_lvds_encoder(dev);
+
+        return encoder && to_lvds_encoder(&encoder->base)->is_dual_link;
 }
 
 static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)
 {
         struct drm_device *dev = lvds_encoder->base.base.dev;
         unsigned int val;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
 
         /* use the module option value if specified */
         if (i915.lvds_channel_mode > 0)
@@ -880,7 +883,7 @@ static bool intel_lvds_supported(struct drm_device *dev)
  */
 void intel_lvds_init(struct drm_device *dev)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_lvds_encoder *lvds_encoder;
         struct intel_encoder *intel_encoder;
         struct intel_lvds_connector *lvds_connector;
@@ -1118,6 +1121,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",
@@ -1130,9 +1134,6 @@ out:
                 DRM_DEBUG_KMS("lid notifier registration failed\n");
                 lvds_connector->lid_notifier.notifier_call = NULL;
         }
-        drm_connector_register(connector);
-
-        intel_panel_setup_backlight(connector, INVALID_PIPE);
 
         return;