On Thu, Sep 24, 2015 at 09:14:15PM +0200, Rafael J. Wysocki wrote: > On Thursday, September 24, 2015 08:40:28 AM Jesse Barnes wrote: > > Forgot to cc Rafael. > > > > On 09/23/2015 02:37 PM, Jesse Barnes wrote: > > > According to the PCI docs and Rafael, we don't need to be doing explicit > > > enables and disables in our init and teardown routines, as they're taken > > > care of by the PCI core. So drop the pm_runtime_disable() at teardown > > > and pm_runtime_set_active() at init. > > > > > > This fixes one failure of the basic-pci-d3-state test on my BYT. > > > > > > v2: drop extra get_noresume() and put_noidle() (Rafael) > > > > > > Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org> > > > --- > > > drivers/gpu/drm/i915/intel_runtime_pm.c | 3 --- > > > 1 file changed, 3 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c > > > index 85c35fd..824e7b0 100644 > > > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > > > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > > > @@ -1822,7 +1822,6 @@ static void intel_runtime_pm_disable(struct drm_i915_private *dev_priv) > > > > > > /* Make sure we're not suspended first. */ > > > pm_runtime_get_sync(device); > > > - pm_runtime_disable(device); > > > } > > > > > > /** > > > @@ -2114,8 +2113,6 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv) > > > if (!HAS_RUNTIME_PM(dev)) > > > return; > > > > > > - pm_runtime_set_active(device); > > > - > > > /* > > > * RPM depends on RC6 to save restore the GT HW context, so make RC6 a > > > * requirement. > > > > > > > Looks good to me, thanks! Queued for -next, thanks for the patch. -Daniel > > Rafael > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
