3 files changed, 0 insertions, 51 deletions

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 024fb954db37..77bc1d28f744 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -622,27 +622,6 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 
                         I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
                         I915_READ(PORT_HOTPLUG_STAT);
-
-                        /* EOS interrupts occurs */
-                        if (IS_IGD(dev) &&
-                                (hotplug_status & CRT_EOS_INT_STATUS)) {
-                                u32 temp;
-
-                                DRM_DEBUG_DRIVER("EOS interrupt occurs\n");
-                                /* status is already cleared */
-                                temp = I915_READ(ADPA);
-                                temp &= ~ADPA_DAC_ENABLE;
-                                I915_WRITE(ADPA, temp);
-
-                                temp = I915_READ(PORT_HOTPLUG_EN);
-                                temp &= ~CRT_EOS_INT_EN;
-                                I915_WRITE(PORT_HOTPLUG_EN, temp);
-
-                                temp = I915_READ(PORT_HOTPLUG_STAT);
-                                if (temp & CRT_EOS_INT_STATUS)
-                                        I915_WRITE(PORT_HOTPLUG_STAT,
-                                                CRT_EOS_INT_STATUS);
-                        }
                 }
 
                 I915_WRITE(IIR, iir);
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index b11a682a4cff..d58f7ad91161 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -852,7 +852,6 @@
 #define   SDVOB_HOTPLUG_INT_EN                  (1 << 26)
 #define   SDVOC_HOTPLUG_INT_EN                  (1 << 25)
 #define   TV_HOTPLUG_INT_EN                     (1 << 18)
-#define   CRT_EOS_INT_EN                        (1 << 10)
 #define   CRT_HOTPLUG_INT_EN                    (1 << 9)
 #define   CRT_HOTPLUG_FORCE_DETECT              (1 << 3)
 #define CRT_HOTPLUG_ACTIVATION_PERIOD_32        (0 << 8)
@@ -887,7 +886,6 @@
 #define   DPC_HOTPLUG_INT_STATUS                (1 << 28)
 #define   HDMID_HOTPLUG_INT_STATUS              (1 << 27)
 #define   DPD_HOTPLUG_INT_STATUS                (1 << 27)
-#define   CRT_EOS_INT_STATUS                    (1 << 12)
 #define   CRT_HOTPLUG_INT_STATUS                (1 << 11)
 #define   TV_HOTPLUG_INT_STATUS                 (1 << 10)
 #define   CRT_HOTPLUG_MONITOR_MASK              (3 << 8)
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 9b48a4465c38..0864a2c40856 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -64,34 +64,6 @@ static void intel_crt_dpms(struct drm_encoder *encoder, int mode)
         }
 
         I915_WRITE(reg, temp);
-
-        if (IS_IGD(dev)) {
-                if (mode == DRM_MODE_DPMS_OFF) {
-                        /* turn off DAC */
-                        temp = I915_READ(PORT_HOTPLUG_EN);
-                        temp &= ~CRT_EOS_INT_EN;
-                        I915_WRITE(PORT_HOTPLUG_EN, temp);
-
-                        temp = I915_READ(PORT_HOTPLUG_STAT);
-                        if (temp & CRT_EOS_INT_STATUS)
-                                I915_WRITE(PORT_HOTPLUG_STAT,
-                                        CRT_EOS_INT_STATUS);
-                } else {
-                        /* turn on DAC. EOS interrupt must be enabled after DAC
-                         * is enabled, so it sounds not good to enable it in
-                         * i915_driver_irq_postinstall()
-                         * wait 12.5ms after DAC is enabled
-                         */
-                        msleep(13);
-                        temp = I915_READ(PORT_HOTPLUG_STAT);
-                        if (temp & CRT_EOS_INT_STATUS)
-                                I915_WRITE(PORT_HOTPLUG_STAT,
-                                        CRT_EOS_INT_STATUS);
-                        temp = I915_READ(PORT_HOTPLUG_EN);
-                        temp |= CRT_EOS_INT_EN;
-                        I915_WRITE(PORT_HOTPLUG_EN, temp);
-                }
-        }
 }
 
 static int intel_crt_mode_valid(struct drm_connector *connector,