1 files changed, 49 insertions, 29 deletions

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 3fbb6fc66451..827b6ef4e9ae 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -67,7 +67,7 @@ static bool intel_crt_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_crt *crt = intel_encoder_to_crt(encoder);
         enum intel_display_power_domain power_domain;
         u32 tmp;
@@ -98,7 +98,7 @@ out:
 
 static unsigned int intel_crt_get_flags(struct intel_encoder *encoder)
 {
-        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
         struct intel_crt *crt = intel_encoder_to_crt(encoder);
         u32 tmp, flags = 0;
 
@@ -146,7 +146,7 @@ static void hsw_crt_get_config(struct intel_encoder *encoder,
 static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
 {
         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_crt *crt = intel_encoder_to_crt(encoder);
         struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
         const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
@@ -281,7 +281,7 @@ static bool intel_ironlake_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;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 adpa;
         bool ret;
 
@@ -301,8 +301,10 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
 
                 I915_WRITE(crt->adpa_reg, adpa);
 
-                if (wait_for((I915_READ(crt->adpa_reg) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
-                             1000))
+                if (intel_wait_for_register(dev_priv,
+                                            crt->adpa_reg,
+                                            ADPA_CRT_HOTPLUG_FORCE_TRIGGER, 0,
+                                            1000))
                         DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
 
                 if (turn_off_dac) {
@@ -326,11 +328,26 @@ 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;
+        struct drm_i915_private *dev_priv = to_i915(dev);
+        bool reenable_hpd;
         u32 adpa;
         bool ret;
         u32 save_adpa;
 
+        /*
+         * Doing a force trigger causes a hpd interrupt to get sent, which can
+         * get us stuck in a loop if we're polling:
+         *  - We enable power wells and reset the ADPA
+         *  - output_poll_exec does force probe on VGA, triggering a hpd
+         *  - HPD handler waits for poll to unlock dev->mode_config.mutex
+         *  - output_poll_exec shuts off the ADPA, unlocks
+         *    dev->mode_config.mutex
+         *  - HPD handler runs, resets ADPA and brings us back to the start
+         *
+         * Just disable HPD interrupts here to prevent this
+         */
+        reenable_hpd = intel_hpd_disable(dev_priv, crt->base.hpd_pin);
+
         save_adpa = adpa = I915_READ(crt->adpa_reg);
         DRM_DEBUG_KMS("trigger hotplug detect cycle: adpa=0x%x\n", adpa);
 
@@ -338,8 +355,10 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
 
         I915_WRITE(crt->adpa_reg, adpa);
 
-        if (wait_for((I915_READ(crt->adpa_reg) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
-                     1000)) {
+        if (intel_wait_for_register(dev_priv,
+                                    crt->adpa_reg,
+                                    ADPA_CRT_HOTPLUG_FORCE_TRIGGER, 0,
+                                    1000)) {
                 DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
                 I915_WRITE(crt->adpa_reg, save_adpa);
         }
@@ -353,6 +372,9 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
 
         DRM_DEBUG_KMS("valleyview hotplug adpa=0x%x, result %d\n", adpa, ret);
 
+        if (reenable_hpd)
+                intel_hpd_enable(dev_priv, crt->base.hpd_pin);
+
         return ret;
 }
 
@@ -367,7 +389,7 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
 static bool intel_crt_detect_hotplug(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         u32 stat;
         bool ret = false;
         int i, tries = 0;
@@ -394,9 +416,9 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
                                               CRT_HOTPLUG_FORCE_DETECT,
                                               CRT_HOTPLUG_FORCE_DETECT);
                 /* wait for FORCE_DETECT to go off */
-                if (wait_for((I915_READ(PORT_HOTPLUG_EN) &
-                              CRT_HOTPLUG_FORCE_DETECT) == 0,
-                             1000))
+                if (intel_wait_for_register(dev_priv, PORT_HOTPLUG_EN,
+                                            CRT_HOTPLUG_FORCE_DETECT, 0,
+                                            1000))
                         DRM_DEBUG_KMS("timed out waiting for FORCE_DETECT to go off");
         }
 
@@ -449,7 +471,7 @@ static int intel_crt_ddc_get_modes(struct drm_connector *connector,
 static bool intel_crt_detect_ddc(struct drm_connector *connector)
 {
         struct intel_crt *crt = intel_attached_crt(connector);
-        struct drm_i915_private *dev_priv = crt->base.base.dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(crt->base.base.dev);
         struct edid *edid;
         struct i2c_adapter *i2c;
 
@@ -485,7 +507,7 @@ static enum drm_connector_status
 intel_crt_load_detect(struct intel_crt *crt, uint32_t pipe)
 {
         struct drm_device *dev = crt->base.base.dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         uint32_t save_bclrpat;
         uint32_t save_vtotal;
         uint32_t vtotal, vactive;
@@ -600,7 +622,7 @@ static enum drm_connector_status
 intel_crt_detect(struct drm_connector *connector, bool force)
 {
         struct drm_device *dev = connector->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_crt *crt = intel_attached_crt(connector);
         struct intel_encoder *intel_encoder = &crt->base;
         enum intel_display_power_domain power_domain;
@@ -681,7 +703,7 @@ static void intel_crt_destroy(struct drm_connector *connector)
 static int intel_crt_get_modes(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         struct intel_crt *crt = intel_attached_crt(connector);
         struct intel_encoder *intel_encoder = &crt->base;
         enum intel_display_power_domain power_domain;
@@ -713,11 +735,11 @@ static int intel_crt_set_property(struct drm_connector *connector,
         return 0;
 }
 
-static void intel_crt_reset(struct drm_connector *connector)
+void intel_crt_reset(struct drm_encoder *encoder)
 {
-        struct drm_device *dev = connector->dev;
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crt *crt = intel_attached_crt(connector);
+        struct drm_device *dev = encoder->dev;
+        struct drm_i915_private *dev_priv = to_i915(dev);
+        struct intel_crt *crt = intel_encoder_to_crt(to_intel_encoder(encoder));
 
         if (INTEL_INFO(dev)->gen >= 5) {
                 u32 adpa;
@@ -739,10 +761,11 @@ static void intel_crt_reset(struct drm_connector *connector)
  */
 
 static const struct drm_connector_funcs intel_crt_connector_funcs = {
-        .reset = intel_crt_reset,
         .dpms = drm_atomic_helper_connector_dpms,
         .detect = intel_crt_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
+        .late_register = intel_connector_register,
+        .early_unregister = intel_connector_unregister,
         .destroy = intel_crt_destroy,
         .set_property = intel_crt_set_property,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
@@ -753,10 +776,10 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = {
 static const struct drm_connector_helper_funcs intel_crt_connector_helper_funcs = {
         .mode_valid = intel_crt_mode_valid,
         .get_modes = intel_crt_get_modes,
-        .best_encoder = intel_best_encoder,
 };
 
 static const struct drm_encoder_funcs intel_crt_enc_funcs = {
+        .reset = intel_crt_reset,
         .destroy = intel_encoder_destroy,
 };
 
@@ -791,7 +814,7 @@ void intel_crt_init(struct drm_device *dev)
         struct drm_connector *connector;
         struct intel_crt *crt;
         struct intel_connector *intel_connector;
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = to_i915(dev);
         i915_reg_t adpa_reg;
         u32 adpa;
 
@@ -839,7 +862,7 @@ void intel_crt_init(struct drm_device *dev)
                            &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
 
         drm_encoder_init(dev, &crt->base.base, &intel_crt_enc_funcs,
-                         DRM_MODE_ENCODER_DAC, NULL);
+                         DRM_MODE_ENCODER_DAC, "CRT");
 
         intel_connector_attach_encoder(intel_connector, &crt->base);
 
@@ -876,12 +899,9 @@ void intel_crt_init(struct drm_device *dev)
                 crt->base.get_hw_state = intel_crt_get_hw_state;
         }
         intel_connector->get_hw_state = intel_connector_get_hw_state;
-        intel_connector->unregister = intel_connector_unregister;
 
         drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);
 
-        drm_connector_register(connector);
-
         if (!I915_HAS_HOTPLUG(dev))
                 intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT;
 
@@ -902,5 +922,5 @@ void intel_crt_init(struct drm_device *dev)
                 dev_priv->fdi_rx_config = I915_READ(FDI_RX_CTL(PIPE_A)) & fdi_config;
         }
 
-        intel_crt_reset(connector);
+        intel_crt_reset(&crt->base.base);
 }