aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2014-03-10 13:44:48 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-10 16:49:49 -0400
commit6c7fba04ecfddd634751239a52df0eccffc8700b (patch)
tree0ef4feab5cac96f74d58dbf296c6c54c8f9def88
parentc6f1495d4c20cfc48ef3527012c31b46527f3839 (diff)
drm/i915: fix typo in display IRQ mask when disabling IRQs
Introduced in commit e0e33f8ff6f0b6d286afc314802be4993341bd47 Author: Imre Deak <imre.deak@intel.com> Date: Tue Mar 4 19:23:07 2014 +0200 The impact was luckily minimal, due to the extra check we do against a software pipestat IRQ mask. Caught by Fengguang's 0-day tester. Cc: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index be2713f12e08..c8e262fc750a 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -3074,7 +3074,7 @@ static void valleyview_display_irqs_uninstall(struct drm_i915_private *dev_priv)
3074 3074
3075 iir_mask = I915_DISPLAY_PORT_INTERRUPT | 3075 iir_mask = I915_DISPLAY_PORT_INTERRUPT |
3076 I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | 3076 I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
3077 I915_DISPLAY_PIPE_A_EVENT_INTERRUPT; 3077 I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
3078 3078
3079 dev_priv->irq_mask |= iir_mask; 3079 dev_priv->irq_mask |= iir_mask;
3080 I915_WRITE(VLV_IER, ~dev_priv->irq_mask); 3080 I915_WRITE(VLV_IER, ~dev_priv->irq_mask);