On Thu, Feb 27, 2014 at 07:26:36PM -0300, Paulo Zanoni wrote: > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index ce582eb..788b165 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6614,7 +6614,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) > > /* Make sure we're not on PC8 state before disabling PC8, otherwise > * we'll hang the machine! */ > - gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL); > + gen6_gt_force_wake_get_no_rpm(dev_priv, FORCEWAKE_ALL); I want more indications that this is legal - i.e. that the function is only called from a special context handling rpm. As it is, it is not immediately clear that the rearrangements in disable_package_c8 is complete. If you moved this forcwake dance higher and comment why the intel_runtime_pm_get() handling is so special, you might not scare so many causal readers. -Chris -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx