1 files changed, 2 insertions, 17 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index eea9e366a109..a74aaf9242b9 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3521,8 +3521,6 @@ intel_dp_link_down(struct intel_dp *intel_dp)
         enum port port = intel_dig_port->port;
         struct drm_device *dev = intel_dig_port->base.base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_crtc *intel_crtc =
-                to_intel_crtc(intel_dig_port->base.base.crtc);
         uint32_t DP = intel_dp->DP;
 
         if (WARN_ON(HAS_DDI(dev)))
@@ -3547,8 +3545,6 @@ intel_dp_link_down(struct intel_dp *intel_dp)
 
         if (HAS_PCH_IBX(dev) &&
             I915_READ(intel_dp->output_reg) & DP_PIPEB_SELECT) {
-                struct drm_crtc *crtc = intel_dig_port->base.base.crtc;
-
                 /* Hardware workaround: leaving our transcoder select
                  * set to transcoder B while it's off will prevent the
                  * corresponding HDMI output on transcoder A.
@@ -3559,18 +3555,7 @@ intel_dp_link_down(struct intel_dp *intel_dp)
                  */
                 DP &= ~DP_PIPEB_SELECT;
                 I915_WRITE(intel_dp->output_reg, DP);
-
-                /* Changes to enable or select take place the vblank
-                 * after being written.
-                 */
-                if (WARN_ON(crtc == NULL)) {
-                        /* We should never try to disable a port without a crtc
-                         * attached. For paranoia keep the code around for a
-                         * bit. */
-                        POSTING_READ(intel_dp->output_reg);
-                        msleep(50);
-                } else
-                        intel_wait_for_vblank(dev, intel_crtc->pipe);
+                POSTING_READ(intel_dp->output_reg);
         }
 
         DP &= ~DP_AUDIO_OUTPUT_ENABLE;
@@ -4446,7 +4431,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
                  */
                 DRM_DEBUG_KMS("ignoring long hpd on eDP port %c\n",
                               port_name(intel_dig_port->port));
-                return false;
+                return IRQ_HANDLED;
         }
 
         DRM_DEBUG_KMS("got hpd irq on port %c - %s\n",