On Mon, Jun 11, 2018 at 11:02:58PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <[email protected]> > > For whatever reason we only unmask and enable the master error > interrut on gen4. With the EIR handling fixed let's do that > on gen2/3 as well. > > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Imre Deak <[email protected]> > --- > drivers/gpu/drm/i915/i915_irq.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 985a137901fb..b4a5582c5042 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -4088,11 +4088,13 @@ static int i8xx_irq_postinstall(struct drm_device > *dev) > /* Unmask the interrupts that we always want on. */ > dev_priv->irq_mask = > ~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | > - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT); > + I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | > + I915_MASTER_ERROR_INTERRUPT); > > enable_mask = > I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | > I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | > + I915_MASTER_ERROR_INTERRUPT | > I915_USER_INTERRUPT; > > GEN2_IRQ_INIT(, dev_priv->irq_mask, enable_mask); > @@ -4256,12 +4258,14 @@ static int i915_irq_postinstall(struct drm_device > *dev) > dev_priv->irq_mask = > ~(I915_ASLE_INTERRUPT | > I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | > - I915_DISPLAY_PIPE_B_EVENT_INTERRUPT); > + I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | > + I915_MASTER_ERROR_INTERRUPT); > > enable_mask = > I915_ASLE_INTERRUPT | > I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | > I915_DISPLAY_PIPE_B_EVENT_INTERRUPT | > + I915_MASTER_ERROR_INTERRUPT | > I915_USER_INTERRUPT; > > if (I915_HAS_HOTPLUG(dev_priv)) { > -- > 2.16.4 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
