[Intel-gfx] [PATCH 07/14] drm/i915: Call gen5_gt_irq_reset() from valleyview_irq_uninstall()

[Ville Syrjälä]

On Fri, Oct 31, 2014 at 11:35:52AM +0200, Ville Syrjälä wrote:
> On Thu, Oct 30, 2014 at 05:51:49PM -0200, Paulo Zanoni wrote:
> > 2014-10-30 15:42 GMT-02:00  <ville.syrjala at linux.intel.com>:
> > > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > >
> > > Looks like we forgot to call gen5_gt_irq_reset() for vlv in the
> > > uninstall phase. Do so.
> > 
> > I also see that valleyview_irq_preinstall() contains 2 writes to GTIIR
> > just before calling gen5_gt_irq_reset(), which should already clear
> > GTIIR, and at the right order. On a quick look, none of your later
> > patches seem to do that, so you could write patch 15/14 for that...
> 
> Yeah, I thought those were part of the "VLV magic" stuff, but apparently
> they were just leftovers basically from these three commits:
> 
>  commit d18ea1b58a5003eb6fca03aff03c4c01321e6cb1
>  Author: Daniel Vetter <daniel.vetter at ffwll.ch>
>  Date:   Fri Jul 12 22:43:25 2013 +0200
> 
>     drm/i915: unify PM interrupt preinstall sequence
> 
>  commit 35079899e78315355d882658ae29bb94a2b6609b
>  Author: Paulo Zanoni <paulo.r.zanoni at intel.com>
>  Date:   Tue Apr 1 15:37:15 2014 -0300
> 
>     drm/i915: add GEN5_IRQ_INIT
> 
>  commit 337ba0175f49b2d3a0bcc893f97f539bda831007
>  Author: Paulo Zanoni <paulo.r.zanoni at intel.com>
>  Date:   Tue Apr 1 15:37:16 2014 -0300
> 
>     drm/i915: check if IIR is still zero at postinstall on Gen5+

Oh, actually it's this one I think (+Daniel's original commit)

 commit f86f3fb005d0c907285fa8685badcb24ec31ee59
 Author: Paulo Zanoni <paulo.r.zanoni at intel.com>
 Date:   Tue Apr 1 15:37:14 2014 -0300

     drm/i915: properly clear IIR at irq_uninstall on Gen5+


> 
> So I'll whip up another patch to kill them.
> 
> I also want kill the "VLV magic" stuff as well, but I think I want to
> test that kind of stuff a bit more since there's no explanation
> whatsoever for the magic.
> 
> > 
> > Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
> > 
> > >
> > > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/i915_irq.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> > > index c106bba..67c046b 100644
> > > --- a/drivers/gpu/drm/i915/i915_irq.c
> > > +++ b/drivers/gpu/drm/i915/i915_irq.c
> > > @@ -3588,6 +3588,8 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
> > >
> > >         I915_WRITE(VLV_MASTER_IER, 0);
> > >
> > > +       gen5_gt_irq_reset(dev);
> > > +
> > >         for_each_pipe(dev_priv, pipe)
> > >                 I915_WRITE(PIPESTAT(pipe), 0xffff);
> > >
> > > --
> > > 2.0.4
> > >
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx at lists.freedesktop.org
> > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > 
> > 
> > 
> > -- 
> > Paulo Zanoni
> 
> -- 
> Ville Syrjälä
> Intel OTC

-- 
Ville Syrjälä
Intel OTC