Skip to contentSkip to conversation

drm/i915: fix typo in display IRQ mask when disabling IRQs

PATCH In review Imre Deak 2 participants 2 messages Mar 10, 2014

Subsystems (2)
lore
Share & tools
lore

Imre Deak

author
#0 lore raw

PATCH 1/1 drm/i915: fix typo in display IRQ mask when disabling IRQs

Introduced in
commit e0e33f8ff6f0b6d286afc314802be4993341bd47

Author: Imre Deak <[email protected]>
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 <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_irq.c +1 -1
index be2713f..c8e262f 100644
@@ -3074,7 +3074,7 @@ static void valleyview_display_irqs_uninstall(struct drm_i915_private *dev_priv)
 
 	iir_mask = I915_DISPLAY_PORT_INTERRUPT |
 		   I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
-		   I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
+		   I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
 
 	dev_priv->irq_mask |= iir_mask;
 	I915_WRITE(VLV_IER, ~dev_priv->irq_mask);
Signature · 1 line
1.8.4
#1 lore raw
Quoted 21 lines · Imre Deak

Introduced in
commit e0e33f8ff6f0b6d286afc314802be4993341bd47

Author: Imre Deak <[email protected]>
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 <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_irq.c +0 -0
index be2713f..c8e262f 100644

drivers/gpu/drm/i915/i915_irq.c static void valleyview_display_irqs_uninstall(struct drm_i915_private *dev_priv) · line 3077

Quoted 5 lines
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -3074,7 +3074,7 @@ static void valleyview_display_irqs_uninstall(struct drm_i915_private *dev_priv)
 
 	iir_mask = I915_DISPLAY_PORT_INTERRUPT |
 		   I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
-		   I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
+		   I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;

Oops. Queued for -next, thanks for the patch.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch