Skip to contentSkip to conversation

Gen9 RC6, Turbo, Coarse Power Gating Fixes

PATCH In review Sagar Arun Kamble 4 participants 30 messages Sep 12, 2015 – Oct 1, 2015

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

v2 cover Gen9 RC6, Turbo, Coarse Power Gating Fixes

Combining all the patches together in this thread related to RC6, Turbo and CPG.
Other pending patches under review are in the

	1. Several GuC related patches
	http://lists.freedesktop.org/archives/intel-gfx/2015-September/075663.html
	2. drm/i915: Increase maximum polling time to 50ms for forcewake request/clear ack
	http://lists.freedesktop.org/archives/intel-gfx/2015-August/074225.html
	3. drm/i915: Use only blitter forcewake
	http://lists.freedesktop.org/archives/intel-gfx/2015-August/074228.html

Alex Dai (1):
drm/i915/guc: Notify coarse power gating configuration to GuC properly

Sagar Arun Kamble (6):
drm/i915: Add IS_SKL_GT3 and IS_SKL_GT4 macro.
drm/i915: WaRsDisableCoarsePowerGating
drm/i915: WaRsUseTimeoutMode
drm/i915: WaRsDoubleRc6WrlWithCoarsePowerGating
drm/i915: Program GuC MAX IDLE Count
drm/i915/bxt: WaGsvDisableTurbo

 drivers/gpu/drm/i915/i915_drv.h            |  5 ++++
 drivers/gpu/drm/i915/i915_guc_reg.h        |  1 +
 drivers/gpu/drm/i915/i915_guc_submission.c |  9 +++++-
 drivers/gpu/drm/i915/intel_pm.c            | 46 ++++++++++++++++++++++++------
 4 files changed, 52 insertions(+), 9 deletions(-)
Signature · 6 lines
1.9.1

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

PATCH v2 1/7 drm/i915: Add IS_SKL_GT3 and IS_SKL_GT4 macro.

It will be usefull to specify w/a that affects only SKL GT3 and GT4.

---
 drivers/gpu/drm/i915/i915_drv.h | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +5 -0
index b5db246..1e48c86 100644
@@ -2491,6 +2491,11 @@ struct drm_i915_cmd_table {
 #define IS_SKL_ULX(dev)		(INTEL_DEVID(dev) == 0x190E || \
 				 INTEL_DEVID(dev) == 0x1915 || \
 				 INTEL_DEVID(dev) == 0x191E)
+#define IS_SKL_GT3(dev)		(IS_SKYLAKE(dev) && \
+				 (INTEL_DEVID(dev) & 0x00F0) == 0x0020)
+#define IS_SKL_GT4(dev)		(IS_SKYLAKE(dev) && \
+				 (INTEL_DEVID(dev) & 0x00F0) == 0x0030)
+
 #define IS_PRELIMINARY_HW(intel_info) ((intel_info)->is_preliminary)
 
 #define SKL_REVID_A0		(0x0)
Signature · 6 lines
1.9.1

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

Re: [PATCH v2 1/7] drm/i915: Add IS_SKL_GT3 and IS_SKL_GT4 macro.

Looks good to me.

Quoted 13 lines · Sagar Arun Kamble

It will be usefull to specify w/a that affects only SKL GT3 and GT4.

---
  drivers/gpu/drm/i915/i915_drv.h | 5 +++++
  1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +0 -0
index b5db246..1e48c86 100644
@@ -2491,6 +2491,11 @@ struct drm_i915_cmd_table {
  #define IS_SKL_ULX(dev)		(INTEL_DEVID(dev) == 0x190E || \

drivers/gpu/drm/i915/i915_drv.h struct drm_i915_cmd_table { · line 2501

Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +5 -0
  				 INTEL_DEVID(dev) == 0x1915 || \
  				 INTEL_DEVID(dev) == 0x191E)
+#define IS_SKL_GT3(dev)		(IS_SKYLAKE(dev) && \
+				 (INTEL_DEVID(dev) & 0x00F0) == 0x0020)
+#define IS_SKL_GT4(dev)		(IS_SKYLAKE(dev) && \
+				 (INTEL_DEVID(dev) & 0x00F0) == 0x0030)
+
  #define IS_PRELIMINARY_HW(intel_info) ((intel_info)->is_preliminary)
 
  #define SKL_REVID_A0		(0x0)

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

#3 lore raw

PATCH v2 2/7 drm/i915: WaRsDisableCoarsePowerGating

In reply to Sagar Arun Kamble

WaRsDisableCoarsePowerGating: Coarse Power Gating (CPG) needs to be disabled for platforms prior to BXT B0 and SKL GT3/GT4 till E0.

v2: Added GT3/GT4 Check.

Change-Id Ia3c4c16e050c88d3e259f601054875c812d69c3a
---
 drivers/gpu/drm/i915/intel_pm.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +7 -4
index 1f6b5bb..c93d3a7 100644
@@ -4853,11 +4853,14 @@ static void gen9_enable_rc6(struct drm_device *dev)
 
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
-	 * WaDisableRenderPowerGating:skl,bxt - Render PG need to be disabled with RC6.
+	 * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6.
 	 */
-	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
-			GEN9_MEDIA_PG_ENABLE : 0);
-
+	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
+		((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_E0)))
+		I915_WRITE(GEN9_PG_ENABLE, 0);
+	else
+		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.9.1

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

Re: [PATCH v2 2/7] drm/i915: WaRsDisableCoarsePowerGating

Looks good to me.

Quoted 24 lines · Sagar Arun Kamble

WaRsDisableCoarsePowerGating: Coarse Power Gating (CPG) needs to be disabled for platforms prior to BXT B0 and SKL GT3/GT4 till E0.

v2: Added GT3/GT4 Check.

Change-Id Ia3c4c16e050c88d3e259f601054875c812d69c3a
---
  drivers/gpu/drm/i915/intel_pm.c | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -3
index 1f6b5bb..c93d3a7 100644
@@ -4853,11 +4853,14 @@ static void gen9_enable_rc6(struct drm_device *dev)
 
  	/*
  	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
-	 * WaDisableRenderPowerGating:skl,bxt - Render PG need to be disabled with RC6.
+	 * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6.
  	 */
-	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
-			GEN9_MEDIA_PG_ENABLE : 0);

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +6 -1
-
+	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
+		((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_E0)))
+		I915_WRITE(GEN9_PG_ENABLE, 0);
+	else
+		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);
 

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

#5 lore raw

Re: [PATCH v2 2/7] drm/i915: WaRsDisableCoarsePowerGating

In reply to Sagar Arun Kamble
Quoted 17 lines · Sagar Arun Kamble

WaRsDisableCoarsePowerGating: Coarse Power Gating (CPG) needs to be disabled for platforms prior to BXT B0 and SKL GT3/GT4 till E0.

v2: Added GT3/GT4 Check.

Change-Id Ia3c4c16e050c88d3e259f601054875c812d69c3a
---
 drivers/gpu/drm/i915/intel_pm.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index 1f6b5bb..c93d3a7 100644
@@ -4853,11 +4853,14 @@ static void gen9_enable_rc6(struct drm_device *dev)
 

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +3 -4
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
-	 * WaDisableRenderPowerGating:skl,bxt - Render PG need to be disabled with RC6.
+	 * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6.
 	 */
-	I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
-			GEN9_MEDIA_PG_ENABLE : 0);
-
+	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
+		((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_E0)))

I fixed up the continuation to be aligned properly while applying. -Daniel

Quoted 14 lines
drivers/gpu/drm/i915/intel_pm.c +4 -0
+		I915_WRITE(GEN9_PG_ENABLE, 0);
+	else
+		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.9.1

_______________________________________________
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 3/7 drm/i915: WaRsUseTimeoutMode

In reply to Sagar Arun Kamble

Enable TO mode for RC6 for SKL till D0 and BXT till A0.

Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
 drivers/gpu/drm/i915/intel_pm.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +10 -3
index c93d3a7..6e4818d 100644
@@ -4847,9 +4847,16 @@ static void gen9_enable_rc6(struct drm_device *dev)
 		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
 	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
 			"on" : "off");
-	I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
-				   GEN6_RC_CTL_EI_MODE(1) |
-				   rc6_mask);
+
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
+		(IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN7_RC_CTL_TO_MODE |
+                                rc6_mask);
+        else
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN6_RC_CTL_EI_MODE(1) |
+                                rc6_mask);
 
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
Signature · 6 lines
1.9.1

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

Re: [PATCH v2 3/7] drm/i915: WaRsUseTimeoutMode

Looks good to me.

Quoted 23 lines · Sagar Arun Kamble

Enable TO mode for RC6 for SKL till D0 and BXT till A0.

Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
  drivers/gpu/drm/i915/intel_pm.c | 13 ++++++++++---
  1 file changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +3 -3
index c93d3a7..6e4818d 100644
@@ -4847,9 +4847,16 @@ static void gen9_enable_rc6(struct drm_device *dev)
  		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
  	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
  			"on" : "off");
-	I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
-				   GEN6_RC_CTL_EI_MODE(1) |
-				   rc6_mask);
+
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
+		(IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +7 -0
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN7_RC_CTL_TO_MODE |
+                                rc6_mask);
+        else
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN6_RC_CTL_EI_MODE(1) |
+                                rc6_mask);
 
  	/*
  	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.

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

#8 lore raw

Re: [PATCH v2 3/7] drm/i915: WaRsUseTimeoutMode

Hello,
This change looks good but incomplete.

When changing RC6 from EI mode to TO mode, should the time value in GEN6_RC6_THRESHOLD be changed to hold the timeout value instead of the evaluation interval period?

Should the workaround name be included in a comment? While this workaround is unnamed for Broadwell, it is called WaRsUseTimeoutMode for Skylake.

If possible, I would like to see those changes squashed into this patch. If not, then putting those changes in a followup patch would be OK.

Thanks,
Tom

Quoted 33 lines · Yu Dai

Looks good to me.

Quoted 29 lines · Sagar Arun Kamble

Enable TO mode for RC6 for SKL till D0 and BXT till A0.

Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
 drivers/gpu/drm/i915/intel_pm.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +9 -3
index c93d3a7..6e4818d 100644
@@ -4847,9 +4847,16 @@ static void gen9_enable_rc6(struct drm_device *dev)
 		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
 	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
 			"on" : "off");
-	I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
-				   GEN6_RC_CTL_EI_MODE(1) |
-				   rc6_mask);
+
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
+		(IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN7_RC_CTL_TO_MODE |
+                                rc6_mask);
+        else
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN6_RC_CTL_EI_MODE(1) |
Quoted 8 lines

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

Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c +1 -0
+                                rc6_mask);
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.

_______________________________________________
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

#9 lore raw

Re: [PATCH v2 3/7] drm/i915: WaRsUseTimeoutMode

In reply to Sagar Arun Kamble
Quoted 14 lines · Sagar Arun Kamble

Enable TO mode for RC6 for SKL till D0 and BXT till A0.

Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
 drivers/gpu/drm/i915/intel_pm.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index c93d3a7..6e4818d 100644

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

Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -4847,9 +4847,16 @@ static void gen9_enable_rc6(struct drm_device *dev)
 		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
 	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
 			"on" : "off");
-	I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
-				   GEN6_RC_CTL_EI_MODE(1) |
-				   rc6_mask);
+
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
+		(IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))

Again I fixed the continuation alignment here ...
-Daniel

Quoted 17 lines
drivers/gpu/drm/i915/intel_pm.c +7 -0
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN7_RC_CTL_TO_MODE |
+                                rc6_mask);
+        else
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN6_RC_CTL_EI_MODE(1) |
+                                rc6_mask);
 
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
Signature · 6 lines
1.9.1

_______________________________________________
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
#10 lore raw

Re: [PATCH v2 3/7] drm/i915: WaRsUseTimeoutMode

Thank you.
I am sending another change Tom wanted as part of this patch. Kindly stash into the current patch.

Thanks
Sagar

Quoted 10 lines · Daniel Vetter
Quoted 9 lines · Sagar Arun Kamble

Enable TO mode for RC6 for SKL till D0 and BXT till A0.

Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
  drivers/gpu/drm/i915/intel_pm.c | 13 ++++++++++---
  1 file changed, 10 insertions(+), 3 deletions(-)
Quoted 34 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +0 -0
index c93d3a7..6e4818d 100644

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

Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -4847,9 +4847,16 @@ static void gen9_enable_rc6(struct drm_device *dev)
  		rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
  	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
  			"on" : "off");
-	I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
-				   GEN6_RC_CTL_EI_MODE(1) |
-				   rc6_mask);
+
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
+		(IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))

Again I fixed the continuation alignment here ...
-Daniel

Quoted 17 lines
drivers/gpu/drm/i915/intel_pm.c +7 -0
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN7_RC_CTL_TO_MODE |
+                                rc6_mask);
+        else
+                I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
+                                GEN6_RC_CTL_EI_MODE(1) |
+                                rc6_mask);
 
  	/*
  	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
Signature · 6 lines
1.9.1

_______________________________________________
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

#11 lore raw

PATCH 1/1 drm/i915: Update Promotion timer for RC6 TO Mode

In reply to Daniel Vetter
---
 drivers/gpu/drm/i915/intel_pm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -3
index a878147..ebde43d 100644
@@ -4842,7 +4842,6 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	for_each_ring(ring, dev_priv, unused)
 		I915_WRITE(RING_MAX_IDLE(ring->mmio_base), 10);
 	I915_WRITE(GEN6_RC_SLEEP, 0);
-	I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
 
 	/* 2c: Program Coarse Power Gating Policies. */
 	I915_WRITE(GEN9_MEDIA_PG_IDLE_HYSTERESIS, 25);
@@ -4854,15 +4853,19 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
 			"on" : "off");
 
+	/* WaRsUseTimeoutMode */
 	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
-	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))
+	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0)) {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN7_RC_CTL_TO_MODE |
                                 rc6_mask);
-        else
+	} else {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN6_RC_CTL_EI_MODE(1) |
                                 rc6_mask);
+	}
 
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
Signature · 6 lines
1.9.1

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

Re: [PATCH 1/1] drm/i915: Update Promotion timer for RC6 TO Mode

This change looks good and is necessary, but the
commit message should have more detail.

I would add:
"When using RC6 timeout mode, the timeout value
should be written to GEN6_RC6_THRESHOLD."

With that,

Quoted 46 lines · Sagar Arun Kamble
---
 drivers/gpu/drm/i915/intel_pm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -3
index a878147..ebde43d 100644
@@ -4842,7 +4842,6 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	for_each_ring(ring, dev_priv, unused)
 		I915_WRITE(RING_MAX_IDLE(ring->mmio_base), 10);
 	I915_WRITE(GEN6_RC_SLEEP, 0);
-	I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
 
 	/* 2c: Program Coarse Power Gating Policies. */
 	I915_WRITE(GEN9_MEDIA_PG_IDLE_HYSTERESIS, 25);
@@ -4854,15 +4853,19 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
 			"on" : "off");
 
+	/* WaRsUseTimeoutMode */
 	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
-	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))
+	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0)) {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN7_RC_CTL_TO_MODE |
                                 rc6_mask);
-        else
+	} else {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN6_RC_CTL_EI_MODE(1) |
                                 rc6_mask);
+	}
 
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
Signature · 6 lines
1.9.1

_______________________________________________
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

#13 lore raw

PATCH v2 1/1 drm/i915: Update Promotion timer for RC6 TO Mode

When using RC6 timeout mode, the timeout value
should be written to GEN6_RC6_THRESHOLD.

v2: Updated commit message. (Tom)

---
 drivers/gpu/drm/i915/intel_pm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -3
index a878147..ebde43d 100644
@@ -4842,7 +4842,6 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	for_each_ring(ring, dev_priv, unused)
 		I915_WRITE(RING_MAX_IDLE(ring->mmio_base), 10);
 	I915_WRITE(GEN6_RC_SLEEP, 0);
-	I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
 
 	/* 2c: Program Coarse Power Gating Policies. */
 	I915_WRITE(GEN9_MEDIA_PG_IDLE_HYSTERESIS, 25);
@@ -4854,15 +4853,19 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
 			"on" : "off");
 
+	/* WaRsUseTimeoutMode */
 	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
-	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))
+	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0)) {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN7_RC_CTL_TO_MODE |
                                 rc6_mask);
-        else
+	} else {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN6_RC_CTL_EI_MODE(1) |
                                 rc6_mask);
+	}
 
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
Signature · 6 lines
1.9.1

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

Re: [PATCH v2 1/1] drm/i915: Update Promotion timer for RC6 TO Mode

Quoted 6 lines · Sagar Arun Kamble

When using RC6 timeout mode, the timeout value
should be written to GEN6_RC6_THRESHOLD.

v2: Updated commit message. (Tom)

Quoted 45 lines
---
 drivers/gpu/drm/i915/intel_pm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -3
index a878147..ebde43d 100644
@@ -4842,7 +4842,6 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	for_each_ring(ring, dev_priv, unused)
 		I915_WRITE(RING_MAX_IDLE(ring->mmio_base), 10);
 	I915_WRITE(GEN6_RC_SLEEP, 0);
-	I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
 
 	/* 2c: Program Coarse Power Gating Policies. */
 	I915_WRITE(GEN9_MEDIA_PG_IDLE_HYSTERESIS, 25);
@@ -4854,15 +4853,19 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?
 			"on" : "off");
 
+	/* WaRsUseTimeoutMode */
 	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
-	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))
+	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0)) {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN7_RC_CTL_TO_MODE |
                                 rc6_mask);
-        else
+	} else {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN6_RC_CTL_EI_MODE(1) |
                                 rc6_mask);
+	}
 
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
Signature · 6 lines
1.9.1

_______________________________________________
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

#15 lore raw

Re: [PATCH v2 1/1] drm/i915: Update Promotion timer for RC6 TO Mode

In reply to Sagar Arun Kamble
Quoted 24 lines · Sagar Arun Kamble

When using RC6 timeout mode, the timeout value
should be written to GEN6_RC6_THRESHOLD.

v2: Updated commit message. (Tom)

---
 drivers/gpu/drm/i915/intel_pm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -1
index a878147..ebde43d 100644
@@ -4842,7 +4842,6 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	for_each_ring(ring, dev_priv, unused)
 		I915_WRITE(RING_MAX_IDLE(ring->mmio_base), 10);
 	I915_WRITE(GEN6_RC_SLEEP, 0);
-	I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
 
 	/* 2c: Program Coarse Power Gating Policies. */
 	I915_WRITE(GEN9_MEDIA_PG_IDLE_HYSTERESIS, 25);
@@ -4854,15 +4853,19 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	DRM_INFO("RC6 %s\n", (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +3 -1
 			"on" : "off");
 
+	/* WaRsUseTimeoutMode */
 	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_D0) ||
-	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0))
+	    (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A0)) {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN7_RC_CTL_TO_MODE |
                                 rc6_mask);

This patch here needs to be regenerated since the whitespace doesn't match
- I've fixed it up when applying the previous patch.
-Daniel

Quoted 17 lines
drivers/gpu/drm/i915/intel_pm.c +3 -1
-        else
+	} else {
+		I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
                 I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
                                 GEN6_RC_CTL_EI_MODE(1) |
                                 rc6_mask);
+	}
 
 	/*
 	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
Signature · 6 lines
1.9.1

_______________________________________________
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
#16 lore raw

PATCH v2 4/7 drm/i915: WaRsDoubleRc6WrlWithCoarsePowerGating

In reply to Sagar Arun Kamble
Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
 drivers/gpu/drm/i915/intel_pm.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +7 -1
index 6e4818d..4d6bb6b 100644
@@ -4830,7 +4830,13 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	I915_WRITE(GEN6_RC_CONTROL, 0);
 
 	/* 2b: Program RC6 thresholds.*/
-	I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16);
+
+	/* WaRsDoubleRc6WrlWithCoarsePowerGating: Doubling WRL only when CPG is enabled */
+	if (IS_SKYLAKE(dev) && !((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) &&
+					(INTEL_REVID(dev) <= SKL_REVID_E0)))
+		I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 108 << 16);
+	else
+		I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16);
 	I915_WRITE(GEN6_RC_EVALUATION_INTERVAL, 125000); /* 12500 * 1280ns */
 	I915_WRITE(GEN6_RC_IDLE_HYSTERSIS, 25); /* 25 * 1280ns */
 	for_each_ring(ring, dev_priv, unused)
Signature · 6 lines
1.9.1

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

Re: [PATCH v2 4/7] drm/i915: WaRsDoubleRc6WrlWithCoarsePowerGating

Looks good to me.

Quoted 16 lines · Sagar Arun Kamble
Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
  drivers/gpu/drm/i915/intel_pm.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +0 -1
index 6e4818d..4d6bb6b 100644
@@ -4830,7 +4830,13 @@ static void gen9_enable_rc6(struct drm_device *dev)
  	I915_WRITE(GEN6_RC_CONTROL, 0);
 
  	/* 2b: Program RC6 thresholds.*/
-	I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16);

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +7 -0
+
+	/* WaRsDoubleRc6WrlWithCoarsePowerGating: Doubling WRL only when CPG is enabled */
+	if (IS_SKYLAKE(dev) && !((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) &&
+					(INTEL_REVID(dev) <= SKL_REVID_E0)))
+		I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 108 << 16);
+	else
+		I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16);
  	I915_WRITE(GEN6_RC_EVALUATION_INTERVAL, 125000); /* 12500 * 1280ns */
  	I915_WRITE(GEN6_RC_IDLE_HYSTERSIS, 25); /* 25 * 1280ns */
  	for_each_ring(ring, dev_priv, unused)

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

#18 lore raw

Re: [PATCH v2 4/7] drm/i915: WaRsDoubleRc6WrlWithCoarsePowerGating

In reply to Sagar Arun Kamble
Quoted 12 lines · Sagar Arun Kamble
Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
 drivers/gpu/drm/i915/intel_pm.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index 6e4818d..4d6bb6b 100644

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

Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +4 -1
@@ -4830,7 +4830,13 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	I915_WRITE(GEN6_RC_CONTROL, 0);
 
 	/* 2b: Program RC6 thresholds.*/
-	I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16);
+
+	/* WaRsDoubleRc6WrlWithCoarsePowerGating: Doubling WRL only when CPG is enabled */
+	if (IS_SKYLAKE(dev) && !((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) &&
+					(INTEL_REVID(dev) <= SKL_REVID_E0)))

Same deal again.
-Daniel

Quoted 13 lines
drivers/gpu/drm/i915/intel_pm.c +3 -0
+		I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 108 << 16);
+	else
+		I915_WRITE(GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16);
 	I915_WRITE(GEN6_RC_EVALUATION_INTERVAL, 125000); /* 12500 * 1280ns */
 	I915_WRITE(GEN6_RC_IDLE_HYSTERSIS, 25); /* 25 * 1280ns */
 	for_each_ring(ring, dev_priv, unused)
Signature · 6 lines
1.9.1

_______________________________________________
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
#19 lore raw

PATCH v2 5/7 drm/i915: Program GuC MAX IDLE Count

In reply to Sagar Arun Kamble
Cc Alex Dai <[email protected]>
Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
 drivers/gpu/drm/i915/i915_guc_reg.h | 1 +
 drivers/gpu/drm/i915/intel_pm.c     | 4 ++++
 2 files changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_guc_reg.h +1 -0
index 8c8e574..9d79a6b 100644
@@ -53,6 +53,7 @@
 #define   START_DMA			  (1<<0)
 #define DMA_GUC_WOPCM_OFFSET		0xc340
 #define   GUC_WOPCM_OFFSET_VALUE	  0x80000	/* 512KB */
+#define GUC_MAX_IDLE_COUNT		0xC3E4
 
 #define GUC_WOPCM_SIZE			0xc050
 #define   GUC_WOPCM_SIZE_VALUE  	  (0x80 << 12)	/* 512KB */
drivers/gpu/drm/i915/intel_pm.c +4 -0
index 4d6bb6b..6843a48 100644
@@ -4841,6 +4841,10 @@ static void gen9_enable_rc6(struct drm_device *dev)
 	I915_WRITE(GEN6_RC_IDLE_HYSTERSIS, 25); /* 25 * 1280ns */
 	for_each_ring(ring, dev_priv, unused)
 		I915_WRITE(RING_MAX_IDLE(ring->mmio_base), 10);
+
+	if (HAS_GUC_UCODE(dev))
+		I915_WRITE(GUC_MAX_IDLE_COUNT, 0xA);
+
 	I915_WRITE(GEN6_RC_SLEEP, 0);
 	I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
 
Signature · 6 lines
1.9.1

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

Re: [PATCH v2 5/7] drm/i915: Program GuC MAX IDLE Count

Looks good to me.

Quoted 26 lines · Sagar Arun Kamble
Cc Alex Dai <[email protected]>
Cc Tom O'Rourke <Tom.O'[email protected]>
Cc Akash Goel <[email protected]>
---
  drivers/gpu/drm/i915/i915_guc_reg.h | 1 +
  drivers/gpu/drm/i915/intel_pm.c     | 4 ++++
  2 files changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_guc_reg.h +1 -0
index 8c8e574..9d79a6b 100644
@@ -53,6 +53,7 @@
  #define   START_DMA			  (1<<0)
  #define DMA_GUC_WOPCM_OFFSET		0xc340
  #define   GUC_WOPCM_OFFSET_VALUE	  0x80000	/* 512KB */
+#define GUC_MAX_IDLE_COUNT		0xC3E4
 
  #define GUC_WOPCM_SIZE			0xc050
  #define   GUC_WOPCM_SIZE_VALUE  	  (0x80 << 12)	/* 512KB */
drivers/gpu/drm/i915/intel_pm.c +0 -0
index 4d6bb6b..6843a48 100644

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +4 -0
@@ -4841,6 +4841,10 @@ static void gen9_enable_rc6(struct drm_device *dev)
  	I915_WRITE(GEN6_RC_IDLE_HYSTERSIS, 25); /* 25 * 1280ns */
  	for_each_ring(ring, dev_priv, unused)
  		I915_WRITE(RING_MAX_IDLE(ring->mmio_base), 10);
+
+	if (HAS_GUC_UCODE(dev))
+		I915_WRITE(GUC_MAX_IDLE_COUNT, 0xA);
+
  	I915_WRITE(GEN6_RC_SLEEP, 0);
  	I915_WRITE(GEN6_RC6_THRESHOLD, 37500); /* 37.5/125ms per EI */
 

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

#21 lore raw

PATCH v2 6/7 drm/i915/guc: Notify coarse power gating configuration to GuC properly

In reply to Sagar Arun Kamble

From: Alex Dai <[email protected]>

GuC expects two bits for Render and Media domain separately when driver sends data via host2guc SAMPLE_FORCEWAKE when full coarse power gating is enabled. Bit 0 is for Render and bit 1 is for Media domain.

---
 drivers/gpu/drm/i915/i915_guc_submission.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_guc_submission.c +8 -1
index 792d0b9..05d1eff4 100644
@@ -155,10 +155,17 @@ static int host2guc_sample_forcewake(struct intel_guc *guc,
 				     struct i915_guc_client *client)
 {
 	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+	struct drm_device *dev = dev_priv->dev;
 	u32 data[2];
 
 	data[0] = HOST2GUC_ACTION_SAMPLE_FORCEWAKE;
-	data[1] = (intel_enable_rc6(dev_priv->dev)) ? 1 : 0;
+
+	/* Notify GuC about Coarse Power Gating where supported */
+	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
+                ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_E0)))
+		data[1] = 0;
+        else
+		data[1] = (intel_enable_rc6(dev)) ? 3 : 0;
 
 	return host2guc_action(guc, data, 2);
 }
Signature · 6 lines
1.9.1

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

Re: [PATCH v2 6/7] drm/i915/guc: Notify coarse power gating configuration to GuC properly

Quoted 23 lines · Sagar Arun Kamble

From: Alex Dai <[email protected]>

GuC expects two bits for Render and Media domain separately when driver sends data via host2guc SAMPLE_FORCEWAKE when full coarse power gating is enabled. Bit 0 is for Render and bit 1 is for Media domain.

---
  drivers/gpu/drm/i915/i915_guc_submission.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_guc_submission.c +1 -0
index 792d0b9..05d1eff4 100644
@@ -155,10 +155,17 @@ static int host2guc_sample_forcewake(struct intel_guc *guc,
  				     struct i915_guc_client *client)
  {
  	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+	struct drm_device *dev = dev_priv->dev;
  	u32 data[2];
 

drivers/gpu/drm/i915/i915_guc_submission.c static int host2guc_sample_forcewake(struct intel_guc *guc, · line 169

Quoted 10 lines
drivers/gpu/drm/i915/i915_guc_submission.c +7 -1
  	data[0] = HOST2GUC_ACTION_SAMPLE_FORCEWAKE;
-	data[1] = (intel_enable_rc6(dev_priv->dev)) ? 1 : 0;
+
+	/* Notify GuC about Coarse Power Gating where supported */
+	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
+                ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_E0)))
+		data[1] = 0;
+        else
+		data[1] = (intel_enable_rc6(dev)) ? 3 : 0;
 

Please hold off this patch. I plan to squash it into http://lists.freedesktop.org/archives/intel-gfx/2015-September/075959.html, where we remove the magic code '3' here by defining forcewake domain flags.

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

#23 lore raw

Re: [PATCH v2 6/7] drm/i915/guc: Notify coarse power gating configuration to GuC properly

Quoted 24 lines · Yu Dai
Quoted 23 lines · Sagar Arun Kamble

From: Alex Dai <[email protected]>

GuC expects two bits for Render and Media domain separately when driver sends data via host2guc SAMPLE_FORCEWAKE when full coarse power gating is enabled. Bit 0 is for Render and bit 1 is for Media domain.

---
  drivers/gpu/drm/i915/i915_guc_submission.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_guc_submission.c +1 -0
index 792d0b9..05d1eff4 100644
@@ -155,10 +155,17 @@ static int host2guc_sample_forcewake(struct intel_guc *guc,
  				     struct i915_guc_client *client)
  {
  	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+	struct drm_device *dev = dev_priv->dev;
  	u32 data[2];
 
Quoted 16 lines

drivers/gpu/drm/i915/i915_guc_submission.c static int host2guc_sample_forcewake(struct intel_guc *guc, · line 169

Quoted 10 lines
drivers/gpu/drm/i915/i915_guc_submission.c +7 -1
  	data[0] = HOST2GUC_ACTION_SAMPLE_FORCEWAKE;
-	data[1] = (intel_enable_rc6(dev_priv->dev)) ? 1 : 0;
+
+	/* Notify GuC about Coarse Power Gating where supported */
+	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
+                ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_E0)))
+		data[1] = 0;
+        else
+		data[1] = (intel_enable_rc6(dev)) ? 3 : 0;
 

Please hold off this patch. I plan to squash it into
http://lists.freedesktop.org/archives/intel-gfx/2015-September/075959.html,
where we remove the magic code '3' here by defining forcewake domain flags.

I did not add this w/a checking to my new patch series. http://lists.freedesktop.org/archives/intel-gfx/2015-September/076348.html. We still need this one. Is it better to add definition like HAS_CPG(dev)? So we can use it here and also in gen9_enable_rc6.

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

#24 lore raw

Re: [PATCH v2 6/7] drm/i915/guc: Notify coarse power gating configuration to GuC properly

In reply to Sagar Arun Kamble

This one can be discarded and I will amend a fix to my other patch series.

Thanks,
Alex

Quoted 25 lines · Sagar Arun Kamble

From: Alex Dai <[email protected]>

GuC expects two bits for Render and Media domain separately when driver sends data via host2guc SAMPLE_FORCEWAKE when full coarse power gating is enabled. Bit 0 is for Render and bit 1 is for Media domain.

---
  drivers/gpu/drm/i915/i915_guc_submission.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
index 792d0b9..05d1eff4 100644
@@ -155,10 +155,17 @@ static int host2guc_sample_forcewake(struct intel_guc *guc,
  				     struct i915_guc_client *client)
  {
  	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+	struct drm_device *dev = dev_priv->dev;
  	u32 data[2];
 
  	data[0] = HOST2GUC_ACTION_SAMPLE_FORCEWAKE;
-	data[1] = (intel_enable_rc6(dev_priv->dev)) ? 1 : 0;

drivers/gpu/drm/i915/i915_guc_submission.c static int host2guc_sample_forcewake(struct intel_guc *guc, · line 171

Quoted 10 lines
drivers/gpu/drm/i915/i915_guc_submission.c +7 -0
+
+	/* Notify GuC about Coarse Power Gating where supported */
+	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
+                ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_E0)))
+		data[1] = 0;
+        else
+		data[1] = (intel_enable_rc6(dev)) ? 3 : 0;
 
  	return host2guc_action(guc, data, 2);
  }

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

#25 lore raw

PATCH v2 7/7 drm/i915/bxt: WaGsvDisableTurbo

In reply to Sagar Arun Kamble

Disable Turbo on steppings prior to B0 on BXT due to hangs seen during GT CPD exit.

Change-Id I50c5c03f59f5ba092db19e17234951d89db42c6c
---
 drivers/gpu/drm/i915/intel_pm.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +10 -0
index 6843a48..90d8834 100644
@@ -4473,6 +4473,10 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
+	/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
+	if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0))
+		return;
+
 	WARN_ON(!mutex_is_locked(&dev_priv->rps.hw_lock));
 	WARN_ON(val > dev_priv->rps.max_freq);
 	WARN_ON(val < dev_priv->rps.min_freq);
@@ -4793,6 +4797,12 @@ static void gen9_enable_rps(struct drm_device *dev)
 
 	gen6_init_rps_frequencies(dev);
 
+	/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
+	if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) {
+		intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+		return;
+	}
+
 	/* Program defaults and thresholds for RPS*/
 	I915_WRITE(GEN6_RC_VIDEO_FREQ,
 		GEN9_FREQUENCY(dev_priv->rps.rp1_freq));
Signature · 6 lines
1.9.1

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

PATCH v3 1/1 drm/i915/bxt: WaGsvDisableTurbo

Disable Turbo on steppings prior to B0 on BXT due to hangs seen during GT CPD exit.

v3: Explicitly clear the Turbo control register (Akash)

Change-Id I50c5c03f59f5ba092db19e17234951d89db42c6c
---
 drivers/gpu/drm/i915/intel_pm.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +20 -0
index 62de97e..b679e8e 100644
@@ -4479,6 +4479,10 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
+	/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
+	if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0))
+		return;
+
 	WARN_ON(!mutex_is_locked(&dev_priv->rps.hw_lock));
 	WARN_ON(val > dev_priv->rps.max_freq);
 	WARN_ON(val < dev_priv->rps.min_freq);
@@ -4799,6 +4803,22 @@ static void gen9_enable_rps(struct drm_device *dev)
 
 	gen6_init_rps_frequencies(dev);
 
+	/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
+	if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) {
+		/*
+		 * BIOS could leave the Hw Turbo enabled, so need to explicitly
+		 * clear out the Control register just to avoid inconsitency
+		 * with debugfs interface, which will show  Turbo as enabled
+		 * only, which is not expected by the User after adding the
+		 * WaGsvDisableTurbo. Apart from this there is no problem even
+		 * if the Turbo is left enabled in the Control register, as the
+		 * Up/Down interrupts would remain masked.
+		 */
+		I915_WRITE(GEN6_RP_CONTROL, 0);
+		intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+		return;
+	}
+
 	/* Program defaults and thresholds for RPS*/
 	I915_WRITE(GEN6_RC_VIDEO_FREQ,
 		GEN9_FREQUENCY(dev_priv->rps.rp1_freq));
Signature · 6 lines
1.9.1

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

Re: [PATCH v2 7/7] drm/i915/bxt: WaGsvDisableTurbo

In reply to Sagar Arun Kamble

Looks good to me.

Quoted 26 lines · Sagar Arun Kamble

Disable Turbo on steppings prior to B0 on BXT due to hangs seen during GT CPD exit.

Change-Id I50c5c03f59f5ba092db19e17234951d89db42c6c
---
  drivers/gpu/drm/i915/intel_pm.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +4 -0
index 6843a48..90d8834 100644
@@ -4473,6 +4473,10 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
 
+	/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
+	if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0))
+		return;
+
  	WARN_ON(!mutex_is_locked(&dev_priv->rps.hw_lock));
  	WARN_ON(val > dev_priv->rps.max_freq);
  	WARN_ON(val < dev_priv->rps.min_freq);
@@ -4793,6 +4797,12 @@ static void gen9_enable_rps(struct drm_device *dev)
 
  	gen6_init_rps_frequencies(dev);

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +6 -0
 
+	/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
+	if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) {
+		intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+		return;
+	}
+
  	/* Program defaults and thresholds for RPS*/
  	I915_WRITE(GEN6_RC_VIDEO_FREQ,
  		GEN9_FREQUENCY(dev_priv->rps.rp1_freq));

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

#28 lore raw

Re: [PATCH v2 7/7] drm/i915/bxt: WaGsvDisableTurbo

Hi Alex,

Could you review and provide r-b tag for 3rd rev: http://lists.freedesktop.org/archives/intel-gfx/2015-September/076223.html

Thanks
Sagar

Quoted 31 lines · Yu Dai

Looks good to me.

Quoted 27 lines · Sagar Arun Kamble

Disable Turbo on steppings prior to B0 on BXT due to hangs seen during GT CPD exit.

Change-Id I50c5c03f59f5ba092db19e17234951d89db42c6c
---
  drivers/gpu/drm/i915/intel_pm.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +3 -0
index 6843a48..90d8834 100644
@@ -4473,6 +4473,10 @@ static void gen6_set_rps(struct drm_device 
 *dev, u8 val)
  {
      struct drm_i915_private *dev_priv = dev->dev_private;
  +    /* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
+    if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0))
+        return;
+
      WARN_ON(!mutex_is_locked(&dev_priv->rps.hw_lock));
      WARN_ON(val > dev_priv->rps.max_freq);
      WARN_ON(val < dev_priv->rps.min_freq);
@@ -4793,6 +4797,12 @@ static void gen9_enable_rps(struct drm_device 
 *dev)
        gen6_init_rps_frequencies(dev);
  +    /* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
Quoted 9 lines

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

Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +5 -0
+    if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) {
+        intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+        return;
+    }
+
      /* Program defaults and thresholds for RPS*/
      I915_WRITE(GEN6_RC_VIDEO_FREQ,
          GEN9_FREQUENCY(dev_priv->rps.rp1_freq));

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

#29 lore raw

Re: [PATCH v2 7/7] drm/i915/bxt: WaGsvDisableTurbo

In reply to Yu Dai
Quoted 8 lines · Yu Dai

Looks good to me.

Quoted 4 lines · Sagar Arun Kamble

Disable Turbo on steppings prior to B0 on BXT due to hangs seen during GT CPD exit.

Change-Id I50c5c03f59f5ba092db19e17234951d89db42c6c

I didn't pick up this one since there's a newer revision. Merged the other patches from this series with an r-b tag.

Thanks, Daniel

Quoted 34 lines
Quoted 19 lines
---
 drivers/gpu/drm/i915/intel_pm.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +4 -0
index 6843a48..90d8834 100644
@@ -4473,6 +4473,10 @@ static void gen6_set_rps(struct drm_device *dev, u8 val)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
+	/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
+	if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0))
+		return;
+
 	WARN_ON(!mutex_is_locked(&dev_priv->rps.hw_lock));
 	WARN_ON(val > dev_priv->rps.max_freq);
 	WARN_ON(val < dev_priv->rps.min_freq);

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +6 -0
@@ -4793,6 +4797,12 @@ static void gen9_enable_rps(struct drm_device *dev)
 	gen6_init_rps_frequencies(dev);
+	/* WaGsvDisableTurbo: Workaround to disable turbo on BXT A* */
+	if (IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) {
+		intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+		return;
+	}
+
 	/* Program defaults and thresholds for RPS*/
 	I915_WRITE(GEN6_RC_VIDEO_FREQ,
 		GEN9_FREQUENCY(dev_priv->rps.rp1_freq));

_______________________________________________
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