<div dir="ltr">oh true. Please just ignore it...</div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Sep 26, 2014 at 11:12 AM, Ville Syrjälä <span dir="ltr"><<a href="mailto:ville.syrjala@linux.intel.com" target="_blank">ville.syrjala@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Fri, Sep 26, 2014 at 01:15:26PM -0400, Rodrigo Vivi wrote:<br>
> 0x130040 is actually a LCPLL_CTL and never was a Forcewake MT Ack.<br>
> The fixed value was introduced but the wrong one was never removed.<br>
> So let's clean the code and definitions a bit.<br>
<br>
</span>NAK. 0x130040 is the forcewake MT ack on IVB.<br>
<div class="HOEnZb"><div class="h5"><br>
><br>
> Signed-off-by: Rodrigo Vivi <<a href="mailto:rodrigo.vivi@intel.com">rodrigo.vivi@intel.com</a>><br>
> ---<br>
>  drivers/gpu/drm/i915/i915_reg.h     |  3 +--<br>
>  drivers/gpu/drm/i915/intel_uncore.c | 13 ++++---------<br>
>  2 files changed, 5 insertions(+), 11 deletions(-)<br>
><br>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h<br>
> index 15c0eaa..edd5485 100644<br>
> --- a/drivers/gpu/drm/i915/i915_reg.h<br>
> +++ b/drivers/gpu/drm/i915/i915_reg.h<br>
> @@ -5512,7 +5512,7 @@ enum punit_power_well {<br>
>  #define  FORCEWAKE_ACK_VLV                   0x1300b4<br>
>  #define  FORCEWAKE_MEDIA_VLV                 0x1300b8<br>
>  #define  FORCEWAKE_ACK_MEDIA_VLV             0x1300bc<br>
> -#define  FORCEWAKE_ACK_HSW                   0x130044<br>
> +#define  FORCEWAKE_MT_ACK                    0x130044<br>
>  #define  FORCEWAKE_ACK                               0x130090<br>
>  #define  VLV_GTLC_WAKE_CTRL                  0x130090<br>
>  #define   VLV_GTLC_RENDER_CTX_EXISTS         (1 << 25)<br>
> @@ -5527,7 +5527,6 @@ enum punit_power_well {<br>
>  #define  FORCEWAKE_MT                                0xa188 /* multi-threaded */<br>
>  #define   FORCEWAKE_KERNEL                   0x1<br>
>  #define   FORCEWAKE_USER                     0x2<br>
> -#define  FORCEWAKE_MT_ACK                    0x130040<br>
>  #define  ECOBUS                                      0xa180<br>
>  #define    FORCEWAKE_MT_ENABLE                       (1<<5)<br>
>  #define  VLV_SPAREG2H                                0xA194<br>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c<br>
> index 918b761..a38c670 100644<br>
> --- a/drivers/gpu/drm/i915/intel_uncore.c<br>
> +++ b/drivers/gpu/drm/i915/intel_uncore.c<br>
> @@ -99,14 +99,8 @@ static void __gen7_gt_force_wake_mt_reset(struct drm_i915_private *dev_priv)<br>
>  static void __gen7_gt_force_wake_mt_get(struct drm_i915_private *dev_priv,<br>
>                                                       int fw_engine)<br>
>  {<br>
> -     u32 forcewake_ack;<br>
> -<br>
> -     if (IS_HASWELL(dev_priv->dev) || IS_BROADWELL(dev_priv->dev))<br>
> -             forcewake_ack = FORCEWAKE_ACK_HSW;<br>
> -     else<br>
> -             forcewake_ack = FORCEWAKE_MT_ACK;<br>
> -<br>
> -     if (wait_for_atomic((__raw_i915_read32(dev_priv, forcewake_ack) & FORCEWAKE_KERNEL) == 0,<br>
> +     if (wait_for_atomic((__raw_i915_read32(dev_priv, FORCEWAKE_MT_ACK)<br>
> +                          & FORCEWAKE_KERNEL) == 0,<br>
>                           FORCEWAKE_ACK_TIMEOUT_MS))<br>
>               DRM_ERROR("Timed out waiting for forcewake old ack to clear.\n");<br>
><br>
> @@ -115,7 +109,8 @@ static void __gen7_gt_force_wake_mt_get(struct drm_i915_private *dev_priv,<br>
>       /* something from same cacheline, but !FORCEWAKE_MT */<br>
>       __raw_posting_read(dev_priv, ECOBUS);<br>
><br>
> -     if (wait_for_atomic((__raw_i915_read32(dev_priv, forcewake_ack) & FORCEWAKE_KERNEL),<br>
> +     if (wait_for_atomic((__raw_i915_read32(dev_priv, FORCEWAKE_MT_ACK)<br>
> +                          & FORCEWAKE_KERNEL),<br>
>                           FORCEWAKE_ACK_TIMEOUT_MS))<br>
>               DRM_ERROR("Timed out waiting for forcewake to ack request.\n");<br>
><br>
> --<br>
> 1.9.3<br>
><br>
> _______________________________________________<br>
> Intel-gfx mailing list<br>
> <a href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br>
> <a href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx" target="_blank">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br>
<br>
</div></div><span class="HOEnZb"><font color="#888888">--<br>
Ville Syrjälä<br>
Intel OTC<br>
</font></span><div class="HOEnZb"><div class="h5">_______________________________________________<br>
Intel-gfx mailing list<br>
<a href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx" target="_blank">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Rodrigo Vivi</div><div>Blog: <a href="http://blog.vivi.eng.br" target="_blank">http://blog.vivi.eng.br</a></div><div> </div>
</div>