On Tue, 4 Mar 2014 19:23:01 +0200 Imre Deak <imre.deak@xxxxxxxxx> wrote: > This is a left-over from > > commit b7e634cc8dcd320123199a18bae0937b40dc28b8 > Author: Imre Deak <imre.deak@xxxxxxxxx> > Date: Tue Feb 4 21:35:45 2014 +0200 > > drm/i915: vlv: don't unmask IIR[DISPLAY_PIPE_A/B_VBLANK] interrupt > > where we stopped unmasking the vblank IRQs, but left them enabled in the > IER register. Disable them in IER too. > > v2: > - remove comment becoming stale after this change (Ville) > > Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_irq.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 331f89c..471d8f9 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -3026,17 +3026,9 @@ static int valleyview_irq_postinstall(struct drm_device *dev) > > enable_mask = I915_DISPLAY_PORT_INTERRUPT; > enable_mask |= I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | > - I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT | > - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | > - I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT; > + I915_DISPLAY_PIPE_B_EVENT_INTERRUPT; > > - /* > - *Leave vblank interrupts masked initially. enable/disable will > - * toggle them based on usage. > - */ > - dev_priv->irq_mask = (~enable_mask) | > - I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT | > - I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT; > + dev_priv->irq_mask = ~enable_mask; > > I915_WRITE(PORT_HOTPLUG_EN, 0); > POSTING_READ(PORT_HOTPLUG_EN); Reviewed-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> -- Jesse Barnes, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
