Merge branches 'irq-urgent-for-linus' and 'timers-urgent-for-linus' of git://git...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / i915 / i915_irq.c

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index d68328fa175b2e82a94f1ac8f572e65eeafcd6c5..0d228f909dcb5fa710dc084f69f0e4cb7bf31bed 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -749,7 +749,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
         * problem.  We may need to extend this to include other platforms,
         * but so far testing only shows the problem on HSW.
         */
-       if (IS_HASWELL(dev) && !position) {
+       if (HAS_DDI(dev) && !position) {
                int i, temp;
 
                for (i = 0; i < 100; i++) {
@@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
 
        /* Ignore TV since it's buggy */
        i915_hotplug_interrupt_update_locked(dev_priv,
-                                     (HOTPLUG_INT_EN_MASK
-                                      | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK),
-                                     hotplug_en);
+                                            HOTPLUG_INT_EN_MASK |
+                                            CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
+                                            CRT_HOTPLUG_ACTIVATION_PERIOD_64,
+                                            hotplug_en);
 }
 
 static irqreturn_t i965_irq_handler(int irq, void *arg)