Reviewed-by: Rodrigo Vivi <[email protected]>
On Wed, Nov 27, 2013 at 05:57:20PM -0200, Paulo Zanoni wrote: > From: Paulo Zanoni <[email protected]> > > When I submitted the first patch adding these force wake functions, > Chris Wilson observed that I was using the wrong functions, so I sent > a second version of the patch to correct this problem. The problem is > that v1 was merged instead of v2. > > I was able to notice the problem when running the > debugfs-forcewake-user subtest of pm_pc8 from intel-gpu-tools. > > V2: - Rebase on the FORCEWAKE_ALL change. > > Cc: [email protected] > Signed-off-by: Paulo Zanoni <[email protected]> > --- > drivers/gpu/drm/i915/intel_display.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index b0d4132..0eb7053 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6583,7 +6583,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! */ > - dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL); > + gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL); > > if (val & LCPLL_POWER_DOWN_ALLOW) { > val &= ~LCPLL_POWER_DOWN_ALLOW; > @@ -6617,7 +6617,7 @@ static void hsw_restore_lcpll(struct drm_i915_private > *dev_priv) > DRM_ERROR("Switching back to LCPLL failed\n"); > } > > - dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL); > + gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL); > } > > void hsw_enable_pc8_work(struct work_struct *__work) > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
