1 files changed, 26 insertions, 22 deletions

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 9293878ec7eb..32a3693905ec 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -88,7 +88,7 @@ static void intel_disable_crt(struct intel_encoder *encoder)
         u32 temp;
 
         temp = I915_READ(crt->adpa_reg);
-        temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE);
+        temp |= ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE;
         temp &= ~ADPA_DAC_ENABLE;
         I915_WRITE(crt->adpa_reg, temp);
 }
@@ -267,27 +267,27 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
 
                 crt->force_hotplug_required = 0;
 
-                save_adpa = adpa = I915_READ(PCH_ADPA);
+                save_adpa = adpa = I915_READ(crt->adpa_reg);
                 DRM_DEBUG_KMS("trigger hotplug detect cycle: adpa=0x%x\n", adpa);
 
                 adpa |= ADPA_CRT_HOTPLUG_FORCE_TRIGGER;
                 if (turn_off_dac)
                         adpa &= ~ADPA_DAC_ENABLE;
 
-                I915_WRITE(PCH_ADPA, adpa);
+                I915_WRITE(crt->adpa_reg, adpa);
 
-                if (wait_for((I915_READ(PCH_ADPA) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
+                if (wait_for((I915_READ(crt->adpa_reg) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
                              1000))
                         DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
 
                 if (turn_off_dac) {
-                        I915_WRITE(PCH_ADPA, save_adpa);
-                        POSTING_READ(PCH_ADPA);
+                        I915_WRITE(crt->adpa_reg, save_adpa);
+                        POSTING_READ(crt->adpa_reg);
                 }
         }
 
         /* Check the status to see if both blue and green are on now */
-        adpa = I915_READ(PCH_ADPA);
+        adpa = I915_READ(crt->adpa_reg);
         if ((adpa & ADPA_CRT_HOTPLUG_MONITOR_MASK) != 0)
                 ret = true;
         else
@@ -300,26 +300,27 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
 static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
+        struct intel_crt *crt = intel_attached_crt(connector);
         struct drm_i915_private *dev_priv = dev->dev_private;
         u32 adpa;
         bool ret;
         u32 save_adpa;
 
-        save_adpa = adpa = I915_READ(ADPA);
+        save_adpa = adpa = I915_READ(crt->adpa_reg);
         DRM_DEBUG_KMS("trigger hotplug detect cycle: adpa=0x%x\n", adpa);
 
         adpa |= ADPA_CRT_HOTPLUG_FORCE_TRIGGER;
 
-        I915_WRITE(ADPA, adpa);
+        I915_WRITE(crt->adpa_reg, adpa);
 
-        if (wait_for((I915_READ(ADPA) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
+        if (wait_for((I915_READ(crt->adpa_reg) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
                      1000)) {
                 DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
-                I915_WRITE(ADPA, save_adpa);
+                I915_WRITE(crt->adpa_reg, save_adpa);
         }
 
         /* Check the status to see if both blue and green are on now */
-        adpa = I915_READ(ADPA);
+        adpa = I915_READ(crt->adpa_reg);
         if ((adpa & ADPA_CRT_HOTPLUG_MONITOR_MASK) != 0)
                 ret = true;
         else
@@ -665,11 +666,11 @@ static void intel_crt_reset(struct drm_connector *connector)
         if (HAS_PCH_SPLIT(dev)) {
                 u32 adpa;
 
-                adpa = I915_READ(PCH_ADPA);
+                adpa = I915_READ(crt->adpa_reg);
                 adpa &= ~ADPA_CRT_HOTPLUG_MASK;
                 adpa |= ADPA_HOTPLUG_BITS;
-                I915_WRITE(PCH_ADPA, adpa);
-                POSTING_READ(PCH_ADPA);
+                I915_WRITE(crt->adpa_reg, adpa);
+                POSTING_READ(crt->adpa_reg);
 
                 DRM_DEBUG_KMS("pch crt adpa set to 0x%x\n", adpa);
                 crt->force_hotplug_required = 1;
@@ -684,7 +685,6 @@ static void intel_crt_reset(struct drm_connector *connector)
 static const struct drm_encoder_helper_funcs crt_encoder_funcs = {
         .mode_fixup = intel_crt_mode_fixup,
         .mode_set = intel_crt_mode_set,
-        .disable = intel_encoder_noop,
 };
 
 static const struct drm_connector_funcs intel_crt_connector_funcs = {
@@ -776,7 +776,7 @@ void intel_crt_init(struct drm_device *dev)
 
         crt->base.disable = intel_disable_crt;
         crt->base.enable = intel_enable_crt;
-        if (IS_HASWELL(dev))
+        if (HAS_DDI(dev))
                 crt->base.get_hw_state = intel_ddi_get_hw_state;
         else
                 crt->base.get_hw_state = intel_crt_get_hw_state;
@@ -800,10 +800,14 @@ void intel_crt_init(struct drm_device *dev)
         dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS;
 
         /*
-         * TODO: find a proper way to discover whether we need to set the
-         * polarity reversal bit or not, instead of relying on the BIOS.
+         * TODO: find a proper way to discover whether we need to set the the
+         * polarity and link reversal bits or not, instead of relying on the
+         * BIOS.
          */
-        if (HAS_PCH_LPT(dev))
-                dev_priv->fdi_rx_polarity_reversed =
-                     !!(I915_READ(_FDI_RXA_CTL) & FDI_RX_POLARITY_REVERSED_LPT);
+        if (HAS_PCH_LPT(dev)) {
+                u32 fdi_config = FDI_RX_POLARITY_REVERSED_LPT |
+                                 FDI_RX_LINK_REVERSAL_OVERRIDE;
+
+                dev_priv->fdi_rx_config = I915_READ(_FDI_RXA_CTL) & fdi_config;
+        }
 }