[Intel-gfx] [PATCH 28/36] drm/i915: Enabling rc6 and rps have different requirements, so separate them

[Chris Wilson]

Quoting Sagar Arun Kamble (2018-03-16 14:01:22)
> 
> 
> On 3/14/2018 3:07 PM, Chris Wilson wrote:
> > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> > index b9c7b21e5cc8..8a5bf1e26515 100644
> > --- a/drivers/gpu/drm/i915/i915_gem.c
> > +++ b/drivers/gpu/drm/i915/i915_gem.c
> > @@ -3165,10 +3165,12 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)
> >   
> >       i915_gem_restore_fences(dev_priv);
> >   
> > -     if (dev_priv->gt.awake) {
> > -             intel_gt_pm_sanitize(dev_priv);
> > -             intel_gt_pm_enable_rps(dev_priv);
> > +     if (dev_priv->gt_pm.rc6.enabled) {
> > +             dev_priv->gt_pm.rc6.enabled = false;
> >               intel_gt_pm_enable_rc6(dev_priv);
> > +     }
> > +
> I think  patch 31 should precede this one to avoid above changes.

I was always a bit doubtful about patch 31 "Don't fiddle with rps/rc6
across reset", so I left it towards the end so I could easily drop it if
need be. ;)
-Chris