Skip to contentSkip to conversation

drm/i915: VLV forcewake fixes

PATCH In review [email protected] 3 participants 10 messages Feb 24, 2014 – Mar 5, 2014 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover drm/i915: VLV forcewake fixes

From: Ville Syrjälä <[email protected]>

While looking at the gen8 forcewake stuff I noticed that the VLV code is a bit different, and also the post-reset forcewake handling is broken. This series fixes those issues. git am didn't like Mika's forcewake patches for some reason so I had to base this on nightly. That's going to lead to some conflicts which sucks a bit, but I was too lazy to hand hold git am.

Ville Syrjälä (2):
drm/i915: Fix VLV forcewake after reset
drm/i915: Drop the forcewake count inc/dec around register read on VLV

 drivers/gpu/drm/i915/intel_uncore.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)
Signature · 6 lines
1.8.3.2

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/2 drm/i915: Fix VLV forcewake after reset

From: Ville Syrjälä <[email protected]>

Use the render/media specific forcewake counts to properly restore the forcewake status after a GPU reset on VLV.

---
 drivers/gpu/drm/i915/intel_uncore.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +16 -4
index c628414..09fa555 100644
@@ -967,10 +967,22 @@ static int gen6_do_reset(struct drm_device *dev)
 	intel_uncore_forcewake_reset(dev);
 
 	/* If reset with a user forcewake, try to restore, otherwise turn it off */
-	if (dev_priv->uncore.forcewake_count)
-		dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
-	else
-		dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
+	if (IS_VALLEYVIEW(dev)) {
+		if (dev_priv->uncore.fw_rendercount)
+			dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_RENDER);
+		else
+			dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_RENDER);
+
+		if (dev_priv->uncore.fw_mediacount)
+			dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_MEDIA);
+		else
+			dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_MEDIA);
+	} else {
+		if (dev_priv->uncore.forcewake_count)
+			dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
+		else
+			dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
+	}
 
 	/* Restore fifo count */
 	dev_priv->uncore.fifo_count = __raw_i915_read32(dev_priv, GTFIFOCTL) & GT_FIFO_FREE_ENTRIES_MASK;
Signature · 6 lines
1.8.3.2

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

A message that is not in the archive (sent off-list or not yet received): CAOh5HuXvv4Kcp+mCYCPp+hb06M_CxZ-Z+hivB7TOcn72tsaBcQ@mail.gmail.com

Reviewed-by
#3 lore raw

Re: Fwd: [PATCH 1/2] drm/i915: Fix VLV forcewake after reset

On Wed, Jan 29, 2014 at 9:55 AM, ville syrjala

Quoted 63 lines

---------- Forwarded message ----------
From: ** <[email protected] <mailto:[email protected]>>
Date: Mon, Feb 24, 2014 at 8:32 PM
Subject: [Intel-gfx] [PATCH 1/2] drm/i915: Fix VLV forcewake after reset
To: [email protected] <mailto:[email protected]>

From: Ville Syrjälä <[email protected] <mailto:[email protected]>>

Use the render/media specific forcewake counts to properly restore the forcewake status after a GPU reset on VLV.

<mailto:[email protected]>>

---
  drivers/gpu/drm/i915/intel_uncore.c | 20 ++++++++++++++++----
  1 file changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +0 -0
index c628414..09fa555 100644
@@ -967,10 +967,22 @@ static int gen6_do_reset(struct drm_device *dev)
         intel_uncore_forcewake_reset(dev);
 
         /* If reset with a user forcewake, try to restore, otherwise

turn it off */

drivers/gpu/drm/i915/intel_uncore.c +0 -2
-       if (dev_priv->uncore.forcewake_count)
-               dev_priv->uncore.funcs.force_wake_get(dev_priv,

FORCEWAKE_ALL);

drivers/gpu/drm/i915/intel_uncore.c +0 -2
-       else
-               dev_priv->uncore.funcs.force_wake_put(dev_priv,

FORCEWAKE_ALL);

drivers/gpu/drm/i915/intel_uncore.c +3 -0
+       if (IS_VALLEYVIEW(dev)) {
+               if (dev_priv->uncore.fw_rendercount)
+                       dev_priv->uncore.funcs.force_wake_get(dev_priv,

FORCEWAKE_RENDER);

drivers/gpu/drm/i915/intel_uncore.c +2 -0
+               else
+                       dev_priv->uncore.funcs.force_wake_put(dev_priv,

FORCEWAKE_RENDER);

drivers/gpu/drm/i915/intel_uncore.c +3 -0
+
+               if (dev_priv->uncore.fw_mediacount)
+                       dev_priv->uncore.funcs.force_wake_get(dev_priv,

FORCEWAKE_MEDIA);

drivers/gpu/drm/i915/intel_uncore.c +2 -0
+               else
+                       dev_priv->uncore.funcs.force_wake_put(dev_priv,

FORCEWAKE_MEDIA);

drivers/gpu/drm/i915/intel_uncore.c +3 -0
+       } else {
+               if (dev_priv->uncore.forcewake_count)
+                       dev_priv->uncore.funcs.force_wake_get(dev_priv,

FORCEWAKE_ALL);

drivers/gpu/drm/i915/intel_uncore.c +2 -0
+               else
+                       dev_priv->uncore.funcs.force_wake_put(dev_priv,

FORCEWAKE_ALL);
+ }

         /* Restore fifo count */
         dev_priv->uncore.fifo_count = __raw_i915_read32(dev_priv,
Quoted 9 lines

GTFIFOCTL) & GT_FIFO_FREE_ENTRIES_MASK;
--
1.8.3.2

_______________________________________________
Intel-gfx mailing list
[email protected] <mailto:[email protected]>
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Re: [PATCH 1/2] drm/i915: Fix VLV forcewake after reset

In reply to [email protected]
Quoted 28 lines · On Mon, Feb 24, 2014 at 05:02:08PM +0200, [email protected] wrote:

From: Ville Syrjälä <[email protected]>

Use the render/media specific forcewake counts to properly restore the forcewake status after a GPU reset on VLV.

---
 drivers/gpu/drm/i915/intel_uncore.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +6 -4
index c628414..09fa555 100644
@@ -967,10 +967,22 @@ static int gen6_do_reset(struct drm_device *dev)
 	intel_uncore_forcewake_reset(dev);
 
 	/* If reset with a user forcewake, try to restore, otherwise turn it off */
-	if (dev_priv->uncore.forcewake_count)
-		dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
-	else
-		dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
+	if (IS_VALLEYVIEW(dev)) {
+		if (dev_priv->uncore.fw_rendercount)
+			dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_RENDER);
+		else
+			dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_RENDER);
+

drivers/gpu/drm/i915/intel_uncore.c static int gen6_do_reset(struct drm_device *dev) · line 985

Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.c +10 -0
+		if (dev_priv->uncore.fw_mediacount)
+			dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_MEDIA);
+		else
+			dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_MEDIA);
+	} else {
+		if (dev_priv->uncore.forcewake_count)
+			dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
+		else
+			dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
+	}

It starts to feel like we should subsume the forcewake stuff into our power domain handling, and create a bunch of domains for this ...

But that's lots of work since we need to switch to a more explicit forcewake power domain handling then I guess. Not sure whether that's worth it.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#5 lore raw

PATCH 2/2 drm/i915: Drop the forcewake count inc/dec around register read on VLV

In reply to [email protected]

From: Ville Syrjälä <[email protected]>

VLV is the only platform where we increment/decrement the forcewake count around register access. Drop the inc/dec on VLV to make the forcewake code a bit more unified.

The inc/dec are not necessary since we hold the uncore lock around the whole operation.

---
 drivers/gpu/drm/i915/intel_uncore.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +5 -5
index 09fa555..dacb751 100644
@@ -502,22 +502,22 @@ gen6_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
 static u##x \
 vlv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
 	unsigned fwengine = 0; \
-	unsigned *fwcount; \
+	unsigned fwcount; \
 	REG_READ_HEADER(x); \
 	if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) {   \
 		fwengine = FORCEWAKE_RENDER;            \
-		fwcount = &dev_priv->uncore.fw_rendercount;    \
+		fwcount = dev_priv->uncore.fw_rendercount;    \
 	}                                               \
 	else if (FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)) {       \
 		fwengine = FORCEWAKE_MEDIA;             \
-		fwcount = &dev_priv->uncore.fw_mediacount;     \
+		fwcount = dev_priv->uncore.fw_mediacount;     \
 	}  \
 	if (fwengine != 0) {		\
-		if ((*fwcount)++ == 0) \
+		if (fwcount == 0) \
 			(dev_priv)->uncore.funcs.force_wake_get(dev_priv, \
 								fwengine); \
 		val = __raw_i915_read##x(dev_priv, reg); \
-		if (--(*fwcount) == 0) \
+		if (fwcount == 0) \
 			(dev_priv)->uncore.funcs.force_wake_put(dev_priv, \
 							fwengine); \
 	} else { \
Signature · 6 lines
1.8.3.2

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

A message that is not in the archive (sent off-list or not yet received): CAOh5HuU0eA0Pb3q=xDP_T_7N8TfWCbKuHZ==dh2G=V_uQfNZww@mail.gmail.com

Reviewed-by
#7 lore raw

Re: Fwd: [PATCH 2/2] drm/i915: Drop the forcewake count inc/dec around register read on VLV

On Wed, Jan 29, 2014 at 9:55 AM, ville syrjala

Quoted 62 lines

---------- Forwarded message ----------
From: ** <[email protected] <mailto:[email protected]>>
Date: Mon, Feb 24, 2014 at 8:32 PM
Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Drop the forcewake count inc/dec around register read on VLV
To: [email protected] <mailto:[email protected]>

From: Ville Syrjälä <[email protected] <mailto:[email protected]>>

VLV is the only platform where we increment/decrement the forcewake count around register access. Drop the inc/dec on VLV to make the forcewake code a bit more unified.

The inc/dec are not necessary since we hold the uncore lock around the whole operation.

<mailto:[email protected]>>

---
  drivers/gpu/drm/i915/intel_uncore.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +5 -5
index 09fa555..dacb751 100644
@@ -502,22 +502,22 @@ gen6_read##x(struct drm_i915_private *dev_priv,
 off_t reg, bool trace) { \
  static u##x \
  vlv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
         unsigned fwengine = 0; \
-       unsigned *fwcount; \
+       unsigned fwcount; \
         REG_READ_HEADER(x); \
         if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) {   \
                 fwengine = FORCEWAKE_RENDER;            \
-               fwcount = &dev_priv->uncore.fw_rendercount;    \
+               fwcount = dev_priv->uncore.fw_rendercount;    \
         }                                               \
         else if (FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)) {       \
                 fwengine = FORCEWAKE_MEDIA;             \
-               fwcount = &dev_priv->uncore.fw_mediacount;     \
+               fwcount = dev_priv->uncore.fw_mediacount;     \
         }  \
         if (fwengine != 0) {            \
-               if ((*fwcount)++ == 0) \
+               if (fwcount == 0) \
                         (dev_priv)->uncore.funcs.force_wake_get(dev_priv, \
 
 fwengine); \
                 val = __raw_i915_read##x(dev_priv, reg); \
-               if (--(*fwcount) == 0) \
+               if (fwcount == 0) \
                         (dev_priv)->uncore.funcs.force_wake_put(dev_priv, \
                                                         fwengine); \
         } else { \
Quoted 9 lines

--
1.8.3.2

_______________________________________________
Intel-gfx mailing list
[email protected] <mailto:[email protected]>
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

[PATCH 3/2] drm/i915: Streamline VLV forcewake handling

In reply to [email protected]

From: Ville Syrjälä <[email protected]>

It occured to me that when we're trying to wake up both render and media wells on VLV, we might end up calling the low level force_wake_get/put two times even though one call would be enough. Make that happen by figuring out which wells really need to be woken up based on the forcewake counts.

---
 drivers/gpu/drm/i915/intel_uncore.c | 70 +++++++++++++++----------------------
 1 file changed, 29 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +29 -41
index dacb751..4119ddc 100644
@@ -251,16 +251,16 @@ void vlv_force_wake_get(struct drm_i915_private *dev_priv,
 	unsigned long irqflags;
 
 	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
-	if (FORCEWAKE_RENDER & fw_engine) {
-		if (dev_priv->uncore.fw_rendercount++ == 0)
-			dev_priv->uncore.funcs.force_wake_get(dev_priv,
-							FORCEWAKE_RENDER);
-	}
-	if (FORCEWAKE_MEDIA & fw_engine) {
-		if (dev_priv->uncore.fw_mediacount++ == 0)
-			dev_priv->uncore.funcs.force_wake_get(dev_priv,
-							FORCEWAKE_MEDIA);
-	}
+
+	if (fw_engine & FORCEWAKE_RENDER &&
+	    dev_priv->uncore.fw_rendercount++ != 0)
+		fw_engine &= ~FORCEWAKE_RENDER;
+	if (fw_engine & FORCEWAKE_MEDIA &&
+	    dev_priv->uncore.fw_mediacount++ != 0)
+		fw_engine &= ~FORCEWAKE_MEDIA;
+
+	if (fw_engine)
+		dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_engine);
 
 	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
 }
@@ -272,19 +272,15 @@ void vlv_force_wake_put(struct drm_i915_private *dev_priv,
 
 	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
 
-	if (FORCEWAKE_RENDER & fw_engine) {
-		WARN_ON(dev_priv->uncore.fw_rendercount == 0);
-		if (--dev_priv->uncore.fw_rendercount == 0)
-			dev_priv->uncore.funcs.force_wake_put(dev_priv,
-							FORCEWAKE_RENDER);
-	}
+	if (fw_engine & FORCEWAKE_RENDER &&
+	    --dev_priv->uncore.fw_rendercount != 0)
+		fw_engine &= ~FORCEWAKE_RENDER;
+	if (fw_engine & FORCEWAKE_MEDIA &&
+	    --dev_priv->uncore.fw_mediacount != 0)
+		fw_engine &= ~FORCEWAKE_MEDIA;
 
-	if (FORCEWAKE_MEDIA & fw_engine) {
-		WARN_ON(dev_priv->uncore.fw_mediacount == 0);
-		if (--dev_priv->uncore.fw_mediacount == 0)
-			dev_priv->uncore.funcs.force_wake_put(dev_priv,
-							FORCEWAKE_MEDIA);
-	}
+	if (fw_engine)
+		dev_priv->uncore.funcs.force_wake_put(dev_priv, fw_engine);
 
 	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
 }
@@ -502,27 +498,19 @@ gen6_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
 static u##x \
 vlv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
 	unsigned fwengine = 0; \
-	unsigned fwcount; \
 	REG_READ_HEADER(x); \
-	if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) {   \
-		fwengine = FORCEWAKE_RENDER;            \
-		fwcount = dev_priv->uncore.fw_rendercount;    \
-	}                                               \
-	else if (FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)) {       \
-		fwengine = FORCEWAKE_MEDIA;             \
-		fwcount = dev_priv->uncore.fw_mediacount;     \
+	if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) { \
+		if (dev_priv->uncore.fw_rendercount == 0) \
+			fwengine = FORCEWAKE_RENDER; \
+	} else if (FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)) { \
+		if (dev_priv->uncore.fw_mediacount == 0) \
+			fwengine = FORCEWAKE_MEDIA; \
 	}  \
-	if (fwengine != 0) {		\
-		if (fwcount == 0) \
-			(dev_priv)->uncore.funcs.force_wake_get(dev_priv, \
-								fwengine); \
-		val = __raw_i915_read##x(dev_priv, reg); \
-		if (fwcount == 0) \
-			(dev_priv)->uncore.funcs.force_wake_put(dev_priv, \
-							fwengine); \
-	} else { \
-		val = __raw_i915_read##x(dev_priv, reg); \
-	} \
+	if (fwengine) \
+		dev_priv->uncore.funcs.force_wake_get(dev_priv, fwengine); \
+	val = __raw_i915_read##x(dev_priv, reg); \
+	if (fwengine) \
+		dev_priv->uncore.funcs.force_wake_put(dev_priv, fwengine); \
 	REG_READ_FOOTER; \
 }
 
Signature · 6 lines
1.8.3.2

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by
#9 lore raw

Re: [PATCH 3/2] drm/i915: Streamline VLV forcewake handling

Quoted 28 lines · On 2/28/2014 1:37 AM, [email protected] wrote:

From: Ville Syrjälä <[email protected]>

It occured to me that when we're trying to wake up both render and media wells on VLV, we might end up calling the low level force_wake_get/put two times even though one call would be enough. Make that happen by figuring out which wells really need to be woken up based on the forcewake counts.

---
  drivers/gpu/drm/i915/intel_uncore.c | 70 +++++++++++++++----------------------
  1 file changed, 29 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +0 -7
index dacb751..4119ddc 100644
@@ -251,16 +251,16 @@ void vlv_force_wake_get(struct drm_i915_private *dev_priv,
  	unsigned long irqflags;
 
  	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
-	if (FORCEWAKE_RENDER & fw_engine) {
-		if (dev_priv->uncore.fw_rendercount++ == 0)
-			dev_priv->uncore.funcs.force_wake_get(dev_priv,
-							FORCEWAKE_RENDER);
-	}
-	if (FORCEWAKE_MEDIA & fw_engine) {
-		if (dev_priv->uncore.fw_mediacount++ == 0)

drivers/gpu/drm/i915/intel_uncore.c void vlv_force_wake_get(struct drm_i915_private *dev_priv, · line 260

Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.c +7 -3
-			dev_priv->uncore.funcs.force_wake_get(dev_priv,
-							FORCEWAKE_MEDIA);
-	}
+
+	if (fw_engine & FORCEWAKE_RENDER &&
+	    dev_priv->uncore.fw_rendercount++ != 0)
+		fw_engine &= ~FORCEWAKE_RENDER;
+	if (fw_engine & FORCEWAKE_MEDIA &&
+	    dev_priv->uncore.fw_mediacount++ != 0)
+		fw_engine &= ~FORCEWAKE_MEDIA;

Should we add WARN_ON? I think it will help us if we have forcewake count mismatch?

Other than this. Patch looks good.

Quoted 63 lines
drivers/gpu/drm/i915/intel_uncore.c +16 -29
+	if (fw_engine)
+		dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_engine);
 
  	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
  }
@@ -272,19 +272,15 @@ void vlv_force_wake_put(struct drm_i915_private *dev_priv,
 
  	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
 
-	if (FORCEWAKE_RENDER & fw_engine) {
-		WARN_ON(dev_priv->uncore.fw_rendercount == 0);
-		if (--dev_priv->uncore.fw_rendercount == 0)
-			dev_priv->uncore.funcs.force_wake_put(dev_priv,
-							FORCEWAKE_RENDER);
-	}
+	if (fw_engine & FORCEWAKE_RENDER &&
+	    --dev_priv->uncore.fw_rendercount != 0)
+		fw_engine &= ~FORCEWAKE_RENDER;
+	if (fw_engine & FORCEWAKE_MEDIA &&
+	    --dev_priv->uncore.fw_mediacount != 0)
+		fw_engine &= ~FORCEWAKE_MEDIA;
 
-	if (FORCEWAKE_MEDIA & fw_engine) {
-		WARN_ON(dev_priv->uncore.fw_mediacount == 0);
-		if (--dev_priv->uncore.fw_mediacount == 0)
-			dev_priv->uncore.funcs.force_wake_put(dev_priv,
-							FORCEWAKE_MEDIA);
-	}
+	if (fw_engine)
+		dev_priv->uncore.funcs.force_wake_put(dev_priv, fw_engine);
 
  	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
  }
@@ -502,27 +498,19 @@ gen6_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
  static u##x \
  vlv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
  	unsigned fwengine = 0; \
-	unsigned fwcount; \
  	REG_READ_HEADER(x); \
-	if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) {   \
-		fwengine = FORCEWAKE_RENDER;            \
-		fwcount = dev_priv->uncore.fw_rendercount;    \
-	}                                               \
-	else if (FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)) {       \
-		fwengine = FORCEWAKE_MEDIA;             \
-		fwcount = dev_priv->uncore.fw_mediacount;     \
+	if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) { \
+		if (dev_priv->uncore.fw_rendercount == 0) \
+			fwengine = FORCEWAKE_RENDER; \
+	} else if (FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)) { \
+		if (dev_priv->uncore.fw_mediacount == 0) \
+			fwengine = FORCEWAKE_MEDIA; \
  	}  \
-	if (fwengine != 0) {		\
-		if (fwcount == 0) \
-			(dev_priv)->uncore.funcs.force_wake_get(dev_priv, \
-								fwengine); \
-		val = __raw_i915_read##x(dev_priv, reg); \
-		if (fwcount == 0) \
-			(dev_priv)->uncore.funcs.force_wake_put(dev_priv, \
-							fwengine); \
-	} else { \

drivers/gpu/drm/i915/intel_uncore.c gen6_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \ · line 516

Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.c +5 -2
-		val = __raw_i915_read##x(dev_priv, reg); \
-	} \
+	if (fwengine) \
+		dev_priv->uncore.funcs.force_wake_get(dev_priv, fwengine); \
+	val = __raw_i915_read##x(dev_priv, reg); \
+	if (fwengine) \
+		dev_priv->uncore.funcs.force_wake_put(dev_priv, fwengine); \
  	REG_READ_FOOTER; \
  }
 

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

Re: [PATCH 3/2] drm/i915: Streamline VLV forcewake handling

Quoted 45 lines · Deepak
Quoted 28 lines · On 2/28/2014 1:37 AM, [email protected] wrote:

From: Ville Syrjälä <[email protected]>

It occured to me that when we're trying to wake up both render and media wells on VLV, we might end up calling the low level force_wake_get/put two times even though one call would be enough. Make that happen by figuring out which wells really need to be woken up based on the forcewake counts.

---
  drivers/gpu/drm/i915/intel_uncore.c | 70 +++++++++++++++----------------------
  1 file changed, 29 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +0 -7
index dacb751..4119ddc 100644
@@ -251,16 +251,16 @@ void vlv_force_wake_get(struct drm_i915_private *dev_priv,
  	unsigned long irqflags;
 
  	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
-	if (FORCEWAKE_RENDER & fw_engine) {
-		if (dev_priv->uncore.fw_rendercount++ == 0)
-			dev_priv->uncore.funcs.force_wake_get(dev_priv,
-							FORCEWAKE_RENDER);
-	}
-	if (FORCEWAKE_MEDIA & fw_engine) {
-		if (dev_priv->uncore.fw_mediacount++ == 0)

drivers/gpu/drm/i915/intel_uncore.c void vlv_force_wake_get(struct drm_i915_private *dev_priv, · line 260

Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.c +7 -3
-			dev_priv->uncore.funcs.force_wake_get(dev_priv,
-							FORCEWAKE_MEDIA);
-	}
+
+	if (fw_engine & FORCEWAKE_RENDER &&
+	    dev_priv->uncore.fw_rendercount++ != 0)
+		fw_engine &= ~FORCEWAKE_RENDER;
+	if (fw_engine & FORCEWAKE_MEDIA &&
+	    dev_priv->uncore.fw_mediacount++ != 0)
+		fw_engine &= ~FORCEWAKE_MEDIA;

Should we add WARN_ON? I think it will help us if we have forcewake count mismatch?

Quoted 2 lines

Other than this. Patch looks good.

I dropped the WARNs since we didn't have them on other platforms either. But if people think they might help, I'm not opposed to keeping them.

Quoted 74 lines
Quoted 74 lines
drivers/gpu/drm/i915/intel_uncore.c +21 -31
+	if (fw_engine)
+		dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_engine);
 
  	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
  }
@@ -272,19 +272,15 @@ void vlv_force_wake_put(struct drm_i915_private *dev_priv,
 
  	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
 
-	if (FORCEWAKE_RENDER & fw_engine) {
-		WARN_ON(dev_priv->uncore.fw_rendercount == 0);
-		if (--dev_priv->uncore.fw_rendercount == 0)
-			dev_priv->uncore.funcs.force_wake_put(dev_priv,
-							FORCEWAKE_RENDER);
-	}
+	if (fw_engine & FORCEWAKE_RENDER &&
+	    --dev_priv->uncore.fw_rendercount != 0)
+		fw_engine &= ~FORCEWAKE_RENDER;
+	if (fw_engine & FORCEWAKE_MEDIA &&
+	    --dev_priv->uncore.fw_mediacount != 0)
+		fw_engine &= ~FORCEWAKE_MEDIA;
 
-	if (FORCEWAKE_MEDIA & fw_engine) {
-		WARN_ON(dev_priv->uncore.fw_mediacount == 0);
-		if (--dev_priv->uncore.fw_mediacount == 0)
-			dev_priv->uncore.funcs.force_wake_put(dev_priv,
-							FORCEWAKE_MEDIA);
-	}
+	if (fw_engine)
+		dev_priv->uncore.funcs.force_wake_put(dev_priv, fw_engine);
 
  	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
  }
@@ -502,27 +498,19 @@ gen6_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
  static u##x \
  vlv_read##x(struct drm_i915_private *dev_priv, off_t reg, bool trace) { \
  	unsigned fwengine = 0; \
-	unsigned fwcount; \
  	REG_READ_HEADER(x); \
-	if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) {   \
-		fwengine = FORCEWAKE_RENDER;            \
-		fwcount = dev_priv->uncore.fw_rendercount;    \
-	}                                               \
-	else if (FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)) {       \
-		fwengine = FORCEWAKE_MEDIA;             \
-		fwcount = dev_priv->uncore.fw_mediacount;     \
+	if (FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg)) { \
+		if (dev_priv->uncore.fw_rendercount == 0) \
+			fwengine = FORCEWAKE_RENDER; \
+	} else if (FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)) { \
+		if (dev_priv->uncore.fw_mediacount == 0) \
+			fwengine = FORCEWAKE_MEDIA; \
  	}  \
-	if (fwengine != 0) {		\
-		if (fwcount == 0) \
-			(dev_priv)->uncore.funcs.force_wake_get(dev_priv, \
-								fwengine); \
-		val = __raw_i915_read##x(dev_priv, reg); \
-		if (fwcount == 0) \
-			(dev_priv)->uncore.funcs.force_wake_put(dev_priv, \
-							fwengine); \
-	} else { \
-		val = __raw_i915_read##x(dev_priv, reg); \
-	} \
+	if (fwengine) \
+		dev_priv->uncore.funcs.force_wake_get(dev_priv, fwengine); \
+	val = __raw_i915_read##x(dev_priv, reg); \
+	if (fwengine) \
+		dev_priv->uncore.funcs.force_wake_put(dev_priv, fwengine); \
  	REG_READ_FOOTER; \
  }
 
Signature · 2 lines
Ville Syrjälä
Intel OTC
#11 lore raw

Re: [PATCH 3/2] drm/i915: Streamline VLV forcewake handling

Quoted 46 lines · Ville Syrjälä
Quoted 45 lines · Deepak
Quoted 28 lines · On 2/28/2014 1:37 AM, [email protected] wrote:

From: Ville Syrjälä <[email protected]>

It occured to me that when we're trying to wake up both render and media wells on VLV, we might end up calling the low level force_wake_get/put two times even though one call would be enough. Make that happen by figuring out which wells really need to be woken up based on the forcewake counts.

---
  drivers/gpu/drm/i915/intel_uncore.c | 70 +++++++++++++++----------------------
  1 file changed, 29 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +0 -7
index dacb751..4119ddc 100644
@@ -251,16 +251,16 @@ void vlv_force_wake_get(struct drm_i915_private *dev_priv,
  	unsigned long irqflags;
 
  	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
-	if (FORCEWAKE_RENDER & fw_engine) {
-		if (dev_priv->uncore.fw_rendercount++ == 0)
-			dev_priv->uncore.funcs.force_wake_get(dev_priv,
-							FORCEWAKE_RENDER);
-	}
-	if (FORCEWAKE_MEDIA & fw_engine) {
-		if (dev_priv->uncore.fw_mediacount++ == 0)

drivers/gpu/drm/i915/intel_uncore.c void vlv_force_wake_get(struct drm_i915_private *dev_priv, · line 260

Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.c +7 -3
-			dev_priv->uncore.funcs.force_wake_get(dev_priv,
-							FORCEWAKE_MEDIA);
-	}
+
+	if (fw_engine & FORCEWAKE_RENDER &&
+	    dev_priv->uncore.fw_rendercount++ != 0)
+		fw_engine &= ~FORCEWAKE_RENDER;
+	if (fw_engine & FORCEWAKE_MEDIA &&
+	    dev_priv->uncore.fw_mediacount++ != 0)
+		fw_engine &= ~FORCEWAKE_MEDIA;

Should we add WARN_ON? I think it will help us if we have forcewake count mismatch?

Quoted 5 lines
Quoted 2 lines

Other than this. Patch looks good.

I dropped the WARNs since we didn't have them on other platforms either. But if people think they might help, I'm not opposed to keeping them.

Especially with the multiple fw domains I think a WARN for a refcount underflow would be useful. btw for vlv fw unification: The delayed put is also still on the table ...

Entire series merged, thanks for patches&review.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch