2 files changed, 1 insertions, 11 deletions

diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
index eac47571e409..53c0173a39fe 100644
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -458,7 +458,6 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
 {
         struct drm_device *dev = dev_priv->dev;
         struct drm_mode_config *mode_config = &dev->mode_config;
-        struct intel_encoder *encoder;
         struct drm_connector *connector;
         int i;
 
@@ -483,16 +482,6 @@ void intel_hpd_init(struct drm_i915_private *dev_priv)
         if (dev_priv->display.hpd_irq_setup)
                 dev_priv->display.hpd_irq_setup(dev);
         spin_unlock_irq(&dev_priv->irq_lock);
-
-        /*
-         * Connected boot / resume scenarios can't generate new hot plug.
-         * So, probe it manually.
-         */
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list,
-                            base.head) {
-                if (encoder->hot_plug)
-                        encoder->hot_plug(encoder);
-        }
 }
 
 void intel_hpd_init_work(struct drm_i915_private *dev_priv)
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 853f4b2f50db..c42b636c2087 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2460,6 +2460,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
                  * Ensure that they get re-enabled when an interrupt happens.
                  */
                 intel_encoder->hot_plug = intel_sdvo_enable_hotplug;
+                intel_sdvo_enable_hotplug(intel_encoder);
         } else {
                 intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
         }