[Intel-gfx] [PATCH] drm/i915/icl+: Fix hotplug interrupt disabling after storm detection

[Imre Deak]

On Fri, Jun 12, 2020 at 04:18:48PM +0300, Ville Syrjälä wrote:
> On Fri, Jun 12, 2020 at 03:17:31PM +0300, Imre Deak wrote:
> > Atm, hotplug interrupts on TypeC ports are left enabled after detecting
> > an interrupt storm, fix this.
> > 
> > Reported-by: Kunal Joshi <kunal1.joshi at intel.com>
> > References: https://gitlab.freedesktop.org/drm/intel/-/issues/351
> > Bugzilla: https://gitlab.freedesktop.org/drm/intel/-/issues/1964
> > Cc: Kunal Joshi <kunal1.joshi at intel.com>
> > Cc: stable at vger.kernel.org
> > Signed-off-by: Imre Deak <imre.deak at intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_irq.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> > index 8e823ba25f5f..710224d930c5 100644
> > --- a/drivers/gpu/drm/i915/i915_irq.c
> > +++ b/drivers/gpu/drm/i915/i915_irq.c
> > @@ -3132,6 +3132,7 @@ static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv)
> >  
> >  	val = I915_READ(GEN11_DE_HPD_IMR);
> >  	val &= ~hotplug_irqs;
> > +	val |= ~enabled_irqs & hotplug_irqs;
> >  	I915_WRITE(GEN11_DE_HPD_IMR, val);
> >  	POSTING_READ(GEN11_DE_HPD_IMR);
> 
> Wondering if we should add a function for this just for consistency
> with all the other platforms.

Yes makes sense, or even abstract the hpd interrupt enabling using the
hpd pin -> interrupt flag table. I think we could even extend that table
with the pulse detection bits and register addresses. I'll check if
something like this would work for all platforms.

> Alhthough we don't strictly need one since we have no other users of
> this register. So maybe not.
> 
> Anyways, patch is
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Thanks, pushed.

> 
> >  
> > -- 
> > 2.23.1
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Ville Syrjälä
> Intel