Skip to contentSkip to conversation

drm/i915: Naming constants to be written to GEN9_PG_ENABLE

PATCH In review [email protected] 3 participants 9 messages Apr 10, 2015 – Apr 13, 2015

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

PATCH 1/2 drm/i915: Naming constants to be written to GEN9_PG_ENABLE

From: Sagar Kamble <[email protected]>

Change-Id I4253459c075c50d9b6f034b4ed4ad2f54cd7d1d7
---
 drivers/gpu/drm/i915/i915_reg.h | 2 ++
 drivers/gpu/drm/i915/intel_pm.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
index c6adf2d..f593900 100644
@@ -6199,6 +6199,8 @@ enum skl_disp_power_wells {
 #define GEN9_MEDIA_PG_IDLE_HYSTERESIS		0xA0C4
 #define GEN9_RENDER_PG_IDLE_HYSTERESIS		0xA0C8
 #define GEN9_PG_ENABLE				0xA210
+#define GEN9_RENDER_PG_ENABLE			(1<<0)
+#define GEN9_MEDIA_PG_ENABLE			(1<<1)
 
 #define VLV_CHICKEN_3				(VLV_DISPLAY_BASE + 0x7040C)
 #define  PIXEL_OVERLAP_CNT_MASK			(3 << 30)
drivers/gpu/drm/i915/intel_pm.c +3 -1
index cafdb29..9975401 100644
@@ -4351,7 +4351,9 @@ static void gen9_enable_rc6(struct drm_device *dev)
 				   rc6_mask);
 
 	/* 3b: Enable Coarse Power Gating only when RC6 is enabled */
-	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ? 3 : 0);
+	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
+			(GEN9_RENDER_PG_ENABLE | GEN9_MEDIA_PG_ENABLE) : 0);
+
 
 	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 
Signature · 6 lines
1.8.5

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

PATCH 2/2 drm/i915: Disable Render power gating

From: Sagar Kamble <[email protected]>

When RC6 along with Render power gating is enabled, GPU hang happens due to lack of synchronization between GTI and Render reset.

Change-Id If1614206341eb52a21eadae8c5ebb2655029b50c

Conflicts:

	drivers/gpu/drm/i915/intel_pm.c
---
 drivers/gpu/drm/i915/intel_pm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +5 -2
index 9975401..f080710 100644
@@ -4350,9 +4350,12 @@ static void gen9_enable_rc6(struct drm_device *dev)
 				   GEN6_RC_CTL_EI_MODE(1) |
 				   rc6_mask);
 
-	/* 3b: Enable Coarse Power Gating only when RC6 is enabled */
+	/*
+	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
+	 * WaDisableRenderPowerGating - Render PG need to be disabled with RC6.
+	 */
 	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
-			(GEN9_RENDER_PG_ENABLE | GEN9_MEDIA_PG_ENABLE) : 0);
+			GEN9_MEDIA_PG_ENABLE : 0);
 
 
 	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
Signature · 6 lines
1.8.5

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

Re: [PATCH 2/2] drm/i915: Disable Render power gating

Quoted 10 lines · On Fri, Apr 10, 2015 at 02:11:30PM +0530, [email protected] wrote:

From: Sagar Kamble <[email protected]>

When RC6 along with Render power gating is enabled, GPU hang happens due to lack of synchronization between GTI and Render reset.

Change-Id If1614206341eb52a21eadae8c5ebb2655029b50c

Conflicts:

	drivers/gpu/drm/i915/intel_pm.c

So, is this a hang that occurs at reset? Do you know if we can do better by disabling/enabling it around reset?

Quoted 9 lines
---
 drivers/gpu/drm/i915/intel_pm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index 9975401..f080710 100644

drivers/gpu/drm/i915/intel_pm.c static void gen9_enable_rc6(struct drm_device *dev) · line 4356

Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +4 -1
@@ -4350,9 +4350,12 @@ static void gen9_enable_rc6(struct drm_device *dev)
 				   GEN6_RC_CTL_EI_MODE(1) |
 				   rc6_mask);
 
-	/* 3b: Enable Coarse Power Gating only when RC6 is enabled */
+	/*
+	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
+	 * WaDisableRenderPowerGating - Render PG need to be disabled with RC6.
+	 */

I don't see any WaDisableRenderPowerGating name in the wa databse, where does that name come from?

Quoted 13 lines
drivers/gpu/drm/i915/intel_pm.c +1 -1
 	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
-			(GEN9_RENDER_PG_ENABLE | GEN9_MEDIA_PG_ENABLE) : 0);
+			GEN9_MEDIA_PG_ENABLE : 0);
 
 
 	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
Signature · 6 lines
1.8.5

_______________________________________________
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

Reviewed-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] drm/i915: Disable Render power gating

In reply to [email protected]
Quoted 4 lines · On Fri, Apr 10, 2015 at 02:11:30PM +0530, [email protected] wrote:

From: Sagar Kamble <[email protected]>

When RC6 along with Render power gating is enabled, GPU hang happens due to lack of synchronization between GTI and Render reset.

Maybe, instead of reset here, say render being power gated?

Quoted 5 lines
Change-Id If1614206341eb52a21eadae8c5ebb2655029b50c

Conflicts:

	drivers/gpu/drm/i915/intel_pm.c

I have limited info about this, but it seems to fix something that has been characterized recently. There may be more dubious interactions to fix around this coarse power gating, RC6 entry and forcewake, but that's another story. So with the skl,bxt mention added:

Quoted 9 lines
---
 drivers/gpu/drm/i915/intel_pm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index 9975401..f080710 100644

drivers/gpu/drm/i915/intel_pm.c static void gen9_enable_rc6(struct drm_device *dev) · line 4356

Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +4 -1
@@ -4350,9 +4350,12 @@ static void gen9_enable_rc6(struct drm_device *dev)
 				   GEN6_RC_CTL_EI_MODE(1) |
 				   rc6_mask);
 
-	/* 3b: Enable Coarse Power Gating only when RC6 is enabled */
+	/*
+	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
+	 * WaDisableRenderPowerGating - Render PG need to be disabled with RC6.
+	 */

WaDisableRenderPowerGating:skl,bxt

Quoted 13 lines
drivers/gpu/drm/i915/intel_pm.c +1 -1
 	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
-			(GEN9_RENDER_PG_ENABLE | GEN9_MEDIA_PG_ENABLE) : 0);
+			GEN9_MEDIA_PG_ENABLE : 0);
 
 
 	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
Signature · 6 lines
1.8.5

_______________________________________________
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

#4 lore raw

PATCH 1/1 drm/i915: Disable Render power gating

From: Sagar Kamble <[email protected]>

When RC6 along with Render power gating is enabled, GPU hang happens due to lack of synchronization between GTI and Render power gating.

Change-Id If1614206341eb52a21eadae8c5ebb2655029b50c
---
 drivers/gpu/drm/i915/intel_pm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +5 -2
index 9975401..4dd8b41 100644
@@ -4350,9 +4350,12 @@ static void gen9_enable_rc6(struct drm_device *dev)
 				   GEN6_RC_CTL_EI_MODE(1) |
 				   rc6_mask);
 
-	/* 3b: Enable Coarse Power Gating only when RC6 is enabled */
+	/*
+	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
+	 * WaDisableRenderPowerGating:skl,bxt - Render PG need to be disabled with RC6.
+	 */
 	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
-			(GEN9_RENDER_PG_ENABLE | GEN9_MEDIA_PG_ENABLE) : 0);
+			GEN9_MEDIA_PG_ENABLE : 0);
 
 
 	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
Signature · 6 lines
1.8.5

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

Re: [PATCH 1/1] drm/i915: Disable Render power gating

Quoted 6 lines · On Fri, Apr 10, 2015 at 05:32:34PM +0530, [email protected] wrote:

From: Sagar Kamble <[email protected]>

When RC6 along with Render power gating is enabled, GPU hang happens due to lack of synchronization between GTI and Render power gating.

When resending patches please have a per-patch changelog here. And if the patch is reviewed please also add all these tags when resending. Otherwise the patch gets lost easily.

Merged the first one meanwhile, thanks.
-Daniel

Quoted 32 lines
Change-Id If1614206341eb52a21eadae8c5ebb2655029b50c
---
 drivers/gpu/drm/i915/intel_pm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +5 -2
index 9975401..4dd8b41 100644
@@ -4350,9 +4350,12 @@ static void gen9_enable_rc6(struct drm_device *dev)
 				   GEN6_RC_CTL_EI_MODE(1) |
 				   rc6_mask);
 
-	/* 3b: Enable Coarse Power Gating only when RC6 is enabled */
+	/*
+	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
+	 * WaDisableRenderPowerGating:skl,bxt - Render PG need to be disabled with RC6.
+	 */
 	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
-			(GEN9_RENDER_PG_ENABLE | GEN9_MEDIA_PG_ENABLE) : 0);
+			GEN9_MEDIA_PG_ENABLE : 0);
 
 
 	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
Signature · 6 lines
1.8.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

PATCH v2 1/1 drm/i915: Disable Render power gating

From: Sagar Kamble <[email protected]>

When RC6 along with Render power gating is enabled, GPU hang happens due to lack of synchronization between GTI and Render power gating.

v2: Updated commit message and WA name (Damien)

Change-Id If1614206341eb52a21eadae8c5ebb2655029b50c
---
 drivers/gpu/drm/i915/intel_pm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +5 -2
index 9975401..4dd8b41 100644
@@ -4350,9 +4350,12 @@ static void gen9_enable_rc6(struct drm_device *dev)
 				   GEN6_RC_CTL_EI_MODE(1) |
 				   rc6_mask);
 
-	/* 3b: Enable Coarse Power Gating only when RC6 is enabled */
+	/*
+	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
+	 * WaDisableRenderPowerGating:skl,bxt - Render PG need to be disabled with RC6.
+	 */
 	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
-			(GEN9_RENDER_PG_ENABLE | GEN9_MEDIA_PG_ENABLE) : 0);
+			GEN9_MEDIA_PG_ENABLE : 0);
 
 
 	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
Signature · 6 lines
1.8.5

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

Re: [PATCH v2 1/1] drm/i915: Disable Render power gating

Quoted 11 lines · On Sun, Apr 12, 2015 at 11:28:14AM +0530, [email protected] wrote:

From: Sagar Kamble <[email protected]>

When RC6 along with Render power gating is enabled, GPU hang happens due to lack of synchronization between GTI and Render power gating.

v2: Updated commit message and WA name (Damien)

Change-Id If1614206341eb52a21eadae8c5ebb2655029b50c

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/2
#8 lore raw
In reply to [email protected]
Quoted 4 lines · On Fri, Apr 10, 2015 at 02:11:29PM +0530, [email protected] wrote:

From: Sagar Kamble <[email protected]>

Change-Id I4253459c075c50d9b6f034b4ed4ad2f54cd7d1d7
Quoted 40 lines
---
 drivers/gpu/drm/i915/i915_reg.h | 2 ++
 drivers/gpu/drm/i915/intel_pm.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
index c6adf2d..f593900 100644
@@ -6199,6 +6199,8 @@ enum skl_disp_power_wells {
 #define GEN9_MEDIA_PG_IDLE_HYSTERESIS		0xA0C4
 #define GEN9_RENDER_PG_IDLE_HYSTERESIS		0xA0C8
 #define GEN9_PG_ENABLE				0xA210
+#define GEN9_RENDER_PG_ENABLE			(1<<0)
+#define GEN9_MEDIA_PG_ENABLE			(1<<1)
 
 #define VLV_CHICKEN_3				(VLV_DISPLAY_BASE + 0x7040C)
 #define  PIXEL_OVERLAP_CNT_MASK			(3 << 30)
drivers/gpu/drm/i915/intel_pm.c +3 -1
index cafdb29..9975401 100644
@@ -4351,7 +4351,9 @@ static void gen9_enable_rc6(struct drm_device *dev)
 				   rc6_mask);
 
 	/* 3b: Enable Coarse Power Gating only when RC6 is enabled */
-	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ? 3 : 0);
+	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
+			(GEN9_RENDER_PG_ENABLE | GEN9_MEDIA_PG_ENABLE) : 0);
+
 
 	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
 
Signature · 6 lines
1.8.5

_______________________________________________
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