| Message ID | 1385582240-2213-1-git-send-email-przanoni@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> On Wed, Nov 27, 2013 at 05:57:20PM -0200, Paulo Zanoni wrote: > From: Paulo Zanoni <paulo.r.zanoni@intel.com> > > 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: stable@vger.kernel.org > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > 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 > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Fri, Nov 29, 2013 at 09:14:41AM -0200, Rodrigo Vivi wrote: > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > > On Wed, Nov 27, 2013 at 05:57:20PM -0200, Paulo Zanoni wrote: > > From: Paulo Zanoni <paulo.r.zanoni@intel.com> > > > > 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: stable@vger.kernel.org > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Picked up for -fixes, thanks for the patch. -Daniel
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)