All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Organize HSW and BDW Forcewake MT Ack.
@ 2014-09-26 17:15 Rodrigo Vivi
  2014-09-26 18:12 ` Ville Syrjälä
  0 siblings, 1 reply; 3+ messages in thread
From: Rodrigo Vivi @ 2014-09-26 17:15 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

0x130040 is actually a LCPLL_CTL and never was a Forcewake MT Ack.
The fixed value was introduced but the wrong one was never removed.
So let's clean the code and definitions a bit.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h     |  3 +--
 drivers/gpu/drm/i915/intel_uncore.c | 13 ++++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 15c0eaa..edd5485 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -5512,7 +5512,7 @@ enum punit_power_well {
 #define  FORCEWAKE_ACK_VLV			0x1300b4
 #define  FORCEWAKE_MEDIA_VLV			0x1300b8
 #define  FORCEWAKE_ACK_MEDIA_VLV		0x1300bc
-#define  FORCEWAKE_ACK_HSW			0x130044
+#define  FORCEWAKE_MT_ACK			0x130044
 #define  FORCEWAKE_ACK				0x130090
 #define  VLV_GTLC_WAKE_CTRL			0x130090
 #define   VLV_GTLC_RENDER_CTX_EXISTS		(1 << 25)
@@ -5527,7 +5527,6 @@ enum punit_power_well {
 #define  FORCEWAKE_MT				0xa188 /* multi-threaded */
 #define   FORCEWAKE_KERNEL			0x1
 #define   FORCEWAKE_USER			0x2
-#define  FORCEWAKE_MT_ACK			0x130040
 #define  ECOBUS					0xa180
 #define    FORCEWAKE_MT_ENABLE			(1<<5)
 #define  VLV_SPAREG2H				0xA194
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 918b761..a38c670 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -99,14 +99,8 @@ static void __gen7_gt_force_wake_mt_reset(struct drm_i915_private *dev_priv)
 static void __gen7_gt_force_wake_mt_get(struct drm_i915_private *dev_priv,
 							int fw_engine)
 {
-	u32 forcewake_ack;
-
-	if (IS_HASWELL(dev_priv->dev) || IS_BROADWELL(dev_priv->dev))
-		forcewake_ack = FORCEWAKE_ACK_HSW;
-	else
-		forcewake_ack = FORCEWAKE_MT_ACK;
-
-	if (wait_for_atomic((__raw_i915_read32(dev_priv, forcewake_ack) & FORCEWAKE_KERNEL) == 0,
+	if (wait_for_atomic((__raw_i915_read32(dev_priv, FORCEWAKE_MT_ACK)
+			     & FORCEWAKE_KERNEL) == 0,
 			    FORCEWAKE_ACK_TIMEOUT_MS))
 		DRM_ERROR("Timed out waiting for forcewake old ack to clear.\n");
 
@@ -115,7 +109,8 @@ static void __gen7_gt_force_wake_mt_get(struct drm_i915_private *dev_priv,
 	/* something from same cacheline, but !FORCEWAKE_MT */
 	__raw_posting_read(dev_priv, ECOBUS);
 
-	if (wait_for_atomic((__raw_i915_read32(dev_priv, forcewake_ack) & FORCEWAKE_KERNEL),
+	if (wait_for_atomic((__raw_i915_read32(dev_priv, FORCEWAKE_MT_ACK)
+			     & FORCEWAKE_KERNEL),
 			    FORCEWAKE_ACK_TIMEOUT_MS))
 		DRM_ERROR("Timed out waiting for forcewake to ack request.\n");
 
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Organize HSW and BDW Forcewake MT Ack.
  2014-09-26 17:15 [PATCH] drm/i915: Organize HSW and BDW Forcewake MT Ack Rodrigo Vivi
@ 2014-09-26 18:12 ` Ville Syrjälä
  2014-09-26 18:27   ` Rodrigo Vivi
  0 siblings, 1 reply; 3+ messages in thread
From: Ville Syrjälä @ 2014-09-26 18:12 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: intel-gfx

On Fri, Sep 26, 2014 at 01:15:26PM -0400, Rodrigo Vivi wrote:
> 0x130040 is actually a LCPLL_CTL and never was a Forcewake MT Ack.
> The fixed value was introduced but the wrong one was never removed.
> So let's clean the code and definitions a bit.

NAK. 0x130040 is the forcewake MT ack on IVB.

> 
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h     |  3 +--
>  drivers/gpu/drm/i915/intel_uncore.c | 13 ++++---------
>  2 files changed, 5 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 15c0eaa..edd5485 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -5512,7 +5512,7 @@ enum punit_power_well {
>  #define  FORCEWAKE_ACK_VLV			0x1300b4
>  #define  FORCEWAKE_MEDIA_VLV			0x1300b8
>  #define  FORCEWAKE_ACK_MEDIA_VLV		0x1300bc
> -#define  FORCEWAKE_ACK_HSW			0x130044
> +#define  FORCEWAKE_MT_ACK			0x130044
>  #define  FORCEWAKE_ACK				0x130090
>  #define  VLV_GTLC_WAKE_CTRL			0x130090
>  #define   VLV_GTLC_RENDER_CTX_EXISTS		(1 << 25)
> @@ -5527,7 +5527,6 @@ enum punit_power_well {
>  #define  FORCEWAKE_MT				0xa188 /* multi-threaded */
>  #define   FORCEWAKE_KERNEL			0x1
>  #define   FORCEWAKE_USER			0x2
> -#define  FORCEWAKE_MT_ACK			0x130040
>  #define  ECOBUS					0xa180
>  #define    FORCEWAKE_MT_ENABLE			(1<<5)
>  #define  VLV_SPAREG2H				0xA194
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index 918b761..a38c670 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -99,14 +99,8 @@ static void __gen7_gt_force_wake_mt_reset(struct drm_i915_private *dev_priv)
>  static void __gen7_gt_force_wake_mt_get(struct drm_i915_private *dev_priv,
>  							int fw_engine)
>  {
> -	u32 forcewake_ack;
> -
> -	if (IS_HASWELL(dev_priv->dev) || IS_BROADWELL(dev_priv->dev))
> -		forcewake_ack = FORCEWAKE_ACK_HSW;
> -	else
> -		forcewake_ack = FORCEWAKE_MT_ACK;
> -
> -	if (wait_for_atomic((__raw_i915_read32(dev_priv, forcewake_ack) & FORCEWAKE_KERNEL) == 0,
> +	if (wait_for_atomic((__raw_i915_read32(dev_priv, FORCEWAKE_MT_ACK)
> +			     & FORCEWAKE_KERNEL) == 0,
>  			    FORCEWAKE_ACK_TIMEOUT_MS))
>  		DRM_ERROR("Timed out waiting for forcewake old ack to clear.\n");
>  
> @@ -115,7 +109,8 @@ static void __gen7_gt_force_wake_mt_get(struct drm_i915_private *dev_priv,
>  	/* something from same cacheline, but !FORCEWAKE_MT */
>  	__raw_posting_read(dev_priv, ECOBUS);
>  
> -	if (wait_for_atomic((__raw_i915_read32(dev_priv, forcewake_ack) & FORCEWAKE_KERNEL),
> +	if (wait_for_atomic((__raw_i915_read32(dev_priv, FORCEWAKE_MT_ACK)
> +			     & FORCEWAKE_KERNEL),
>  			    FORCEWAKE_ACK_TIMEOUT_MS))
>  		DRM_ERROR("Timed out waiting for forcewake to ack request.\n");
>  
> -- 
> 1.9.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Organize HSW and BDW Forcewake MT Ack.
  2014-09-26 18:12 ` Ville Syrjälä
@ 2014-09-26 18:27   ` Rodrigo Vivi
  0 siblings, 0 replies; 3+ messages in thread
From: Rodrigo Vivi @ 2014-09-26 18:27 UTC (permalink / raw)
  To: Ville Syrjälä; +Cc: intel-gfx, Rodrigo Vivi


[-- Attachment #1.1: Type: text/plain, Size: 4151 bytes --]

oh true. Please just ignore it...

On Fri, Sep 26, 2014 at 11:12 AM, Ville Syrjälä <
ville.syrjala@linux.intel.com> wrote:

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



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br

[-- Attachment #1.2: Type: text/html, Size: 5814 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-26 18:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-26 17:15 [PATCH] drm/i915: Organize HSW and BDW Forcewake MT Ack Rodrigo Vivi
2014-09-26 18:12 ` Ville Syrjälä
2014-09-26 18:27   ` Rodrigo Vivi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.