Skip to contentSkip to conversation

drm/i915/chv: WaDisablePwrmtrEvent:chv on CHV only

PATCH In review Tom.O'[email protected] 6 participants 16 messages Jun 9, 2014 – Jun 13, 2014

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

PATCH 1/1 drm/i915/chv: WaDisablePwrmtrEvent:chv on CHV only

From: Tom O'Rourke <Tom.O'[email protected]>

In gen8_enable_rps, don't write CHV registers unless IS_CHERRYVIEW.

---
 drivers/gpu/drm/i915/intel_pm.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +4 -2
index d9c5918..3d3e402 100644
@@ -3522,8 +3522,10 @@ static void gen8_enable_rps(struct drm_device *dev)
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
 	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
-	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+	if (IS_CHERRYVIEW(dev)) {
+		I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
+		I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+	}
 
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
Signature · 1 line
1.7.9.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · On Mon, Jun 09, 2014 at 10:06:49AM -0700, Tom.O'[email protected] wrote:

From: Tom O'Rourke <Tom.O'[email protected]>

In gen8_enable_rps, don't write CHV registers unless IS_CHERRYVIEW.

A lovely catch.

Signature · 1 line
Damien
Quoted 28 lines
---
 drivers/gpu/drm/i915/intel_pm.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +4 -2
index d9c5918..3d3e402 100644
@@ -3522,8 +3522,10 @@ static void gen8_enable_rps(struct drm_device *dev)
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
 	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
-	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+	if (IS_CHERRYVIEW(dev)) {
+		I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
+		I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+	}
 
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
Signature · 6 lines
1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#2 lore raw
Quoted 8 lines · Damien Lespiau
Quoted 5 lines · On Mon, Jun 09, 2014 at 10:06:49AM -0700, Tom.O'[email protected] wrote:

From: Tom O'Rourke <Tom.O'[email protected]>

In gen8_enable_rps, don't write CHV registers unless IS_CHERRYVIEW.

A lovely catch.

Sadly gen8_enable_rps does not get called on chv, so the fix is wrong.

BR,
Jani.

Quoted 38 lines
Signature · 1 line
Damien
Quoted 28 lines
---
 drivers/gpu/drm/i915/intel_pm.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +4 -2
index d9c5918..3d3e402 100644
@@ -3522,8 +3522,10 @@ static void gen8_enable_rps(struct drm_device *dev)
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
 	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
-	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+	if (IS_CHERRYVIEW(dev)) {
+		I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
+		I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+	}
 
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
Signature · 6 lines
1.7.9.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

Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
maintainer
#3 lore raw
Quoted 11 lines · Jani Nikula
Quoted 8 lines · Damien Lespiau
Quoted 5 lines · On Mon, Jun 09, 2014 at 10:06:49AM -0700, Tom.O'[email protected] wrote:

From: Tom O'Rourke <Tom.O'[email protected]>

In gen8_enable_rps, don't write CHV registers unless IS_CHERRYVIEW.

A lovely catch.

Sadly gen8_enable_rps does not get called on chv, so the fix is wrong.

To elaborate, I think we need a patch dropping the wa altogether (which we can queue for 3.15 through stable because the change affects broadwell) and another patch, if needed, adding the wa in the chv specific function.

Thanks,
Jani.

Quoted 45 lines

BR,
Jani.

Quoted 38 lines
Signature · 1 line
Damien
Quoted 28 lines
---
 drivers/gpu/drm/i915/intel_pm.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +4 -2
index d9c5918..3d3e402 100644
@@ -3522,8 +3522,10 @@ static void gen8_enable_rps(struct drm_device *dev)
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
 	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
-	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+	if (IS_CHERRYVIEW(dev)) {
+		I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
+		I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+	}
 
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
Signature · 6 lines
1.7.9.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

Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
#4 lore raw
Quoted 9 lines · Jani Nikula
Quoted 8 lines · Jani Nikula
Quoted 7 lines · Damien Lespiau
Quoted 5 lines · On Mon, Jun 09, 2014 at 10:06:49AM -0700, Tom.O'[email protected] wrote:

From: Tom O'Rourke <Tom.O'[email protected]>

In gen8_enable_rps, don't write CHV registers unless IS_CHERRYVIEW.

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

A lovely catch.

Sadly gen8_enable_rps does not get called on chv, so the fix is wrong.

To elaborate, I think we need a patch dropping the wa altogether (which we can queue for 3.15 through stable because the change affects broadwell) and another patch, if needed, adding the wa in the chv specific function.

This is just a merge mishap in one the chv patches. Someone just needs to send a patch that moves the misapplied stuff to the appropriate chv function.

Signature · 2 lines
Ville Syrjälä
Intel OTC
maintainer
#5 lore raw
Quoted 14 lines · Ville Syrjälä
Quoted 13 lines · Jani Nikula
Quoted 11 lines · Jani Nikula
Quoted 8 lines · Damien Lespiau
Quoted 5 lines · On Mon, Jun 09, 2014 at 10:06:49AM -0700, Tom.O'[email protected] wrote:

From: Tom O'Rourke <Tom.O'[email protected]>

In gen8_enable_rps, don't write CHV registers unless IS_CHERRYVIEW.

A lovely catch.

Sadly gen8_enable_rps does not get called on chv, so the fix is wrong.

Quoted 8 lines
Quoted 4 lines

To elaborate, I think we need a patch dropping the wa altogether (which we can queue for 3.15 through stable because the change affects broadwell) and another patch, if needed, adding the wa in the chv specific function.

This is just a merge mishap in one the chv patches. Someone just needs to send a patch that moves the misapplied stuff to the appropriate chv function.

Right. So my first comment was correct, and my elaboration total bullcrap. This is not present in 3.15, but we've queued the screwup for 3.16. Thanks for the correction Ville.

BR,
Jani.

Quoted 4 lines
Signature · 3 lines
-- 
Ville Syrjälä
Intel OTC
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
Quoted 14 lines
Quoted 3 lines

This is just a merge mishap in one the chv patches. Someone just needs to send a patch that moves the misapplied stuff to the appropriate chv function.

Right. So my first comment was correct, and my elaboration total bullcrap. This is not present in 3.15, but we've queued the screwup for 3.16. Thanks for the correction Ville.

BR,
Jani.

Quoted 1 line
Quoted 6 lines
Quoted 3 lines

--
Ville Syrjälä
Intel OTC

--
Jani Nikula, Intel Open Source Technology Center

[TOR:] Hi Ville,
Do you want to be the someone to send the patch that moves the misapplied stuff? I could guess where it goes but I do not have a CHV for testing the fix. Thanks,
Tom
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw
Quoted 14 lines · Tom
Quoted 14 lines
Quoted 3 lines

This is just a merge mishap in one the chv patches. Someone just needs to send a patch that moves the misapplied stuff to the appropriate chv function.

Right. So my first comment was correct, and my elaboration total bullcrap. This is not present in 3.15, but we've queued the screwup for 3.16. Thanks for the correction Ville.

BR,
Jani.

Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

--
Ville Syrjälä
Intel OTC

--
Jani Nikula, Intel Open Source Technology Center

[TOR:] Hi Ville,
Do you want to be the someone to send the patch that moves the misapplied stuff?

Go ahead if you want to do it. Easy +1 to your patch statistics ;)

Quoted 1 line

I could guess where it goes

Or just look at the original patch:
http://patchwork.freedesktop.org/patch/23974/

Quoted 1 line

but I do not have a CHV for testing the fix.\

You're not alone in that. In any case the patch was never really tested, except by the compiler :P

Signature · 2 lines
Ville Syrjälä
Intel OTC
#8 lore raw

PATCH 1/1 drm/i915/chv: Fix "drm/i915/chv: Add a bunch of pre production workarounds"

In reply to O'Rourke, Tom

From: Tom O'Rourke <Tom.O'[email protected]>

Correct a merge mishap in commit e4443e459ccf43f2c139358400365fd6a839d40d.

Wa*:chv belongs in cherryview_enable_rps, not gen8_enable_rps.

---
 drivers/gpu/drm/i915/intel_pm.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -6
index 18f0ba0..c6e893b 100644
@@ -3520,15 +3520,11 @@ static void gen8_enable_rps(struct drm_device *dev)
 
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
-	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
-	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
-
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
 		   GEN6_RP_MEDIA_TURBO |
 		   GEN6_RP_MEDIA_HW_NORMAL_MODE |
-		   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
+		   GEN6_RP_MEDIA_IS_GFX |
 		   GEN6_RP_ENABLE |
 		   GEN6_RP_UP_BUSY_AVG |
 		   GEN6_RP_DOWN_IDLE_AVG);
@@ -4022,10 +4018,14 @@ static void cherryview_enable_rps(struct drm_device *dev)
 
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
+	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
+	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
+	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
 		   GEN6_RP_MEDIA_HW_NORMAL_MODE |
-		   GEN6_RP_MEDIA_IS_GFX |
+		   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
 		   GEN6_RP_ENABLE |
 		   GEN6_RP_UP_BUSY_AVG |
 		   GEN6_RP_DOWN_IDLE_AVG);
Signature · 1 line
1.7.9.5
Reviewed-by on v1 1/1
#9 lore raw

Re: [PATCH] drm/i915/chv: Fix "drm/i915/chv: Add a bunch of pre production workarounds"

Quoted 7 lines · On Tue, Jun 10, 2014 at 04:26:34PM -0700, Tom.O'[email protected] wrote:

From: Tom O'Rourke <Tom.O'[email protected]>

Correct a merge mishap in commit e4443e459ccf43f2c139358400365fd6a839d40d.

Wa*:chv belongs in cherryview_enable_rps, not gen8_enable_rps.

Quoted 48 lines
---
 drivers/gpu/drm/i915/intel_pm.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -6
index 18f0ba0..c6e893b 100644
@@ -3520,15 +3520,11 @@ static void gen8_enable_rps(struct drm_device *dev)
 
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
-	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
-	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
-
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
 		   GEN6_RP_MEDIA_TURBO |
 		   GEN6_RP_MEDIA_HW_NORMAL_MODE |
-		   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
+		   GEN6_RP_MEDIA_IS_GFX |
 		   GEN6_RP_ENABLE |
 		   GEN6_RP_UP_BUSY_AVG |
 		   GEN6_RP_DOWN_IDLE_AVG);
@@ -4022,10 +4018,14 @@ static void cherryview_enable_rps(struct drm_device *dev)
 
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
+	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
+	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
+	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
 		   GEN6_RP_MEDIA_HW_NORMAL_MODE |
-		   GEN6_RP_MEDIA_IS_GFX |
+		   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
 		   GEN6_RP_ENABLE |
 		   GEN6_RP_UP_BUSY_AVG |
 		   GEN6_RP_DOWN_IDLE_AVG);
Signature · 6 lines
1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä
Intel OTC
#10 lore raw

Re: [PATCH] drm/i915/chv: Fix "drm/i915/chv: Add a bunch of pre production workarounds"

Quoted 10 lines · Ville Syrjälä
Quoted 7 lines · On Tue, Jun 10, 2014 at 04:26:34PM -0700, Tom.O'[email protected] wrote:

From: Tom O'Rourke <Tom.O'[email protected]>

Correct a merge mishap in commit e4443e459ccf43f2c139358400365fd6a839d40d.

Wa*:chv belongs in cherryview_enable_rps, not gen8_enable_rps.

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

Quoted 57 lines
Quoted 49 lines
---
 drivers/gpu/drm/i915/intel_pm.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -6
index 18f0ba0..c6e893b 100644
@@ -3520,15 +3520,11 @@ static void gen8_enable_rps(struct drm_device *dev)
 
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
-	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
-	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
-
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
 		   GEN6_RP_MEDIA_TURBO |
 		   GEN6_RP_MEDIA_HW_NORMAL_MODE |
-		   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
+		   GEN6_RP_MEDIA_IS_GFX |
 		   GEN6_RP_ENABLE |
 		   GEN6_RP_UP_BUSY_AVG |
 		   GEN6_RP_DOWN_IDLE_AVG);
@@ -4022,10 +4018,14 @@ static void cherryview_enable_rps(struct drm_device *dev)
 
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
+	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
+	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
+	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
+
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
 		   GEN6_RP_MEDIA_HW_NORMAL_MODE |
-		   GEN6_RP_MEDIA_IS_GFX |
+		   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
 		   GEN6_RP_ENABLE |
 		   GEN6_RP_UP_BUSY_AVG |
 		   GEN6_RP_DOWN_IDLE_AVG);
Signature · 6 lines
1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
maintainer
#11 lore raw
In reply to Jani Nikula
Quoted 20 lines · Jani Nikula
Quoted 19 lines · Ville Syrjälä
Quoted 17 lines · Jani Nikula
Quoted 11 lines · Jani Nikula
Quoted 8 lines · Damien Lespiau
Quoted 5 lines · On Mon, Jun 09, 2014 at 10:06:49AM -0700, Tom.O'[email protected] wrote:

From: Tom O'Rourke <Tom.O'[email protected]>

In gen8_enable_rps, don't write CHV registers unless IS_CHERRYVIEW.

A lovely catch.

Sadly gen8_enable_rps does not get called on chv, so the fix is wrong.

To elaborate, I think we need a patch dropping the wa altogether (which we can queue for 3.15 through stable because the change affects broadwell) and another patch, if needed, adding the wa in the chv specific function.

Quoted 7 lines
Quoted 3 lines

This is just a merge mishap in one the chv patches. Someone just needs to send a patch that moves the misapplied stuff to the appropriate chv function.

Right. So my first comment was correct, and my elaboration total bullcrap. This is not present in 3.15, but we've queued the screwup for 3.16. Thanks for the correction Ville.

Argh. I'm really confusing myself and others here. Please bear with me.

So we've added

commit e4443e459ccf43f2c139358400365fd6a839d40d

Author: Ville Syrjälä <[email protected]>
Date:   Wed Apr 9 13:28:41 2014 +0300

drm/i915/chv: Add a bunch of pre production workarounds

which contains the chv specific w/a in bdw code. This is now going to 3.16, and we need to fix this for 3.16 through drm-intel-fixes. Effectively the hunk touching gen8_enable_rps() from Tom's new patch [1]. Right?

However the new patch from Tom moves those bits to cherryview_enable_rps(), which is only present since

commit 38807746fa2ce44b79957ff07813d10fcaf3d311

Author: Deepak S <[email protected]>
Date:   Fri May 23 21:00:15 2014 +0530

drm/i915/chv: Enable Render Standby (RC6) for Cherryview

and queued for 3.17. So we need another patch adding the bits to cherryview_enable_rps() on top of drm-intel-next-queued, effectively the second hunk from Tom's new patch. Right?

So Tom, please split your patch in two, one on top of drm-intel-fixes, and another on top of drm-intel-next-queued, and I think we'll be fine.

BR,
Jani.

[1] http://mid.gmane.org/1402442794-166797-1-git-send-email-Tom.O'[email protected]

Quoted 13 lines

BR,
Jani.

Quoted 4 lines
Signature · 3 lines
-- 
Ville Syrjälä
Intel OTC
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#12 lore raw
Quoted 51 lines · Jani Nikula
Quoted 20 lines · Jani Nikula
Quoted 19 lines · Ville Syrjälä
Quoted 17 lines · Jani Nikula
Quoted 11 lines · Jani Nikula
Quoted 8 lines · Damien Lespiau
Quoted 5 lines · On Mon, Jun 09, 2014 at 10:06:49AM -0700, Tom.O'[email protected] wrote:

From: Tom O'Rourke <Tom.O'[email protected]>

In gen8_enable_rps, don't write CHV registers unless IS_CHERRYVIEW.

A lovely catch.

Sadly gen8_enable_rps does not get called on chv, so the fix is wrong.

To elaborate, I think we need a patch dropping the wa altogether (which we can queue for 3.15 through stable because the change affects broadwell) and another patch, if needed, adding the wa in the chv specific function.

Quoted 7 lines
Quoted 3 lines

This is just a merge mishap in one the chv patches. Someone just needs to send a patch that moves the misapplied stuff to the appropriate chv function.

Right. So my first comment was correct, and my elaboration total bullcrap. This is not present in 3.15, but we've queued the screwup for 3.16. Thanks for the correction Ville.

Argh. I'm really confusing myself and others here. Please bear with me.

So we've added

commit e4443e459ccf43f2c139358400365fd6a839d40d

Author: Ville Syrjälä <[email protected]>
Date:   Wed Apr 9 13:28:41 2014 +0300

drm/i915/chv: Add a bunch of pre production workarounds

which contains the chv specific w/a in bdw code. This is now going to 3.16, and we need to fix this for 3.16 through drm-intel-fixes. Effectively the hunk touching gen8_enable_rps() from Tom's new patch [1]. Right?

However the new patch from Tom moves those bits to cherryview_enable_rps(), which is only present since

commit 38807746fa2ce44b79957ff07813d10fcaf3d311

Author: Deepak S <[email protected]>
Date:   Fri May 23 21:00:15 2014 +0530
Quoted 8 lines

drm/i915/chv: Enable Render Standby (RC6) for Cherryview

and queued for 3.17. So we need another patch adding the bits to cherryview_enable_rps() on top of drm-intel-next-queued, effectively the second hunk from Tom's new patch. Right?

So Tom, please split your patch in two, one on top of drm-intel-fixes, and another on top of drm-intel-next-queued, and I think we'll be fine.

I've already merged Tom's patch to dinq since it's fully needed there. So I think we just need a new patch version for -fixes only and resolve the mess in a merge (shouldn't cause one). If we split the patch also for dinq then I need to rebase/merge again. I guess you could simply apply Tom's fix to -fixes and drop the unecessary hunk yourself.
-Daniel

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

PATCH 1/1 drm/i915/bdw: remove erroneous chv specific workarounds from bdw code

From: Tom O'Rourke <Tom.O'[email protected]>

Correct a merge mishap in

commit e4443e459ccf43f2c139358400365fd6a839d40d

Author: Ville Syrjälä <[email protected]>
Date:   Wed Apr 9 13:28:41 2014 +0300

drm/i915/chv: Add a bunch of pre production workarounds

Remove the the chv specific workarounds from bdw code, specifically gen8_enable_rps().

[Jani: extract hunk #1 for 3.16 from Tom's patch, clarify commit message]

---

All, I intend to push this to drm-intel-fixes, any objections?

Jani.

---
 drivers/gpu/drm/i915/intel_pm.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -5
index 7e2db9abd810..769caea97c21 100644
@@ -3505,15 +3505,11 @@ static void gen8_enable_rps(struct drm_device *dev)
 
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
-	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
-	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
-
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
 		   GEN6_RP_MEDIA_TURBO |
 		   GEN6_RP_MEDIA_HW_NORMAL_MODE |
-		   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
+		   GEN6_RP_MEDIA_IS_GFX |
 		   GEN6_RP_ENABLE |
 		   GEN6_RP_UP_BUSY_AVG |
 		   GEN6_RP_DOWN_IDLE_AVG);
Signature · 6 lines
1.9.1

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

Re: [PATCH] drm/i915/bdw: remove erroneous chv specific workarounds from bdw code

Quoted 19 lines · Jani Nikula

From: Tom O'Rourke <Tom.O'[email protected]>

Correct a merge mishap in

commit e4443e459ccf43f2c139358400365fd6a839d40d

Author: Ville Syrjälä <[email protected]>
Date:   Wed Apr 9 13:28:41 2014 +0300

drm/i915/chv: Add a bunch of pre production workarounds

Remove the the chv specific workarounds from bdw code, specifically gen8_enable_rps().

[Jani: extract hunk #1 for 3.16 from Tom's patch, clarify commit message]
Quoted 3 lines

---

All, I intend to push this to drm-intel-fixes, any objections?

And pushed with Daniel's IRC ack. Thanks everyone.

BR,
Jani.

Quoted 34 lines

Jani.

---
 drivers/gpu/drm/i915/intel_pm.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -5
index 7e2db9abd810..769caea97c21 100644
@@ -3505,15 +3505,11 @@ static void gen8_enable_rps(struct drm_device *dev)
 
 	I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
 
-	/* WaDisablePwrmtrEvent:chv (pre-production hw) */
-	I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
-	I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
-
 	/* 5: Enable RPS */
 	I915_WRITE(GEN6_RP_CONTROL,
 		   GEN6_RP_MEDIA_TURBO |
 		   GEN6_RP_MEDIA_HW_NORMAL_MODE |
-		   GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
+		   GEN6_RP_MEDIA_IS_GFX |
 		   GEN6_RP_ENABLE |
 		   GEN6_RP_UP_BUSY_AVG |
 		   GEN6_RP_DOWN_IDLE_AVG);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#15 lore raw

Re: [PATCH] drm/i915/bdw: remove erroneous chv specific workarounds from bdw code

In reply to Jani Nikula
Quoted 6 lines

---

All, I intend to push this to drm-intel-fixes, any objections?

Jani.
---

[TOR:] I have no objections. Looks good to me.