* [PATCH] drm/i915: fix typo in display IRQ mask when disabling IRQs
@ 2014-03-10 17:44 Imre Deak
2014-03-10 20:50 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Imre Deak @ 2014-03-10 17:44 UTC (permalink / raw)
To: intel-gfx; +Cc: Fengguang Wu
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>
---
drivers/gpu/drm/i915/i915_irq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index be2713f..c8e262f 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)
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);
--
1.8.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/i915: fix typo in display IRQ mask when disabling IRQs
2014-03-10 17:44 [PATCH] drm/i915: fix typo in display IRQ mask when disabling IRQs Imre Deak
@ 2014-03-10 20:50 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2014-03-10 20:50 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx, Fengguang Wu
On Mon, Mar 10, 2014 at 07:44:48PM +0200, Imre Deak wrote:
> 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>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index be2713f..c8e262f 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)
>
> 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
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-10 20:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-10 17:44 [PATCH] drm/i915: fix typo in display IRQ mask when disabling IRQs Imre Deak
2014-03-10 20:50 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox