Skip to contentSkip to conversation

drm/i915: Disable WaGsvRC0ResidencyMethod for vlv

PATCH In review [email protected] 6 participants 11 messages Mar 19, 2015 – Apr 15, 2015

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

PATCH 1/1 drm/i915: Disable WaGsvRC0ResidencyMethod for vlv

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88012

---
 drivers/gpu/drm/i915/i915_irq.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +1 -5
index 6d8340d..7bbdede 100644
@@ -4241,11 +4241,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
 	INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
 
 	/* Let's track the enabled rps events */
-	if (IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
-		/* WaGsvRC0ResidencyMethod:vlv */
-		dev_priv->pm_rps_events = GEN6_PM_RP_DOWN_EI_EXPIRED | GEN6_PM_RP_UP_EI_EXPIRED;
-	else
-		dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
+	dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
 
 	INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,
 			  i915_hangcheck_elapsed);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#1 lore raw
Quoted 7 lines · On Thu, 19 Mar 2015, [email protected] wrote:

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88012

Introduced in

commit 31685c258e0b0ad6aa486c5ec001382cf8a64212

Author: Deepak S <[email protected]>
Date:   Thu Jul 3 17:33:01 2014 -0400

drm/i915/vlv: WA for Turbo and RC6 to work together.

Quoted 28 lines
---
 drivers/gpu/drm/i915/i915_irq.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +1 -5
index 6d8340d..7bbdede 100644
@@ -4241,11 +4241,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
 	INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
 
 	/* Let's track the enabled rps events */
-	if (IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
-		/* WaGsvRC0ResidencyMethod:vlv */
-		dev_priv->pm_rps_events = GEN6_PM_RP_DOWN_EI_EXPIRED | GEN6_PM_RP_UP_EI_EXPIRED;
-	else
-		dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
+	dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
 
 	INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,
 			  i915_hangcheck_elapsed);
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
#2 lore raw
In reply to [email protected]
Quoted 4 lines · On Thu, Mar 19, 2015 at 04:09:44PM +0530, [email protected] wrote:

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Do we want to throw out the actual code as well then?

Quoted 26 lines

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88012

---
 drivers/gpu/drm/i915/i915_irq.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +1 -5
index 6d8340d..7bbdede 100644
@@ -4241,11 +4241,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
 	INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
 
 	/* Let's track the enabled rps events */
-	if (IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
-		/* WaGsvRC0ResidencyMethod:vlv */
-		dev_priv->pm_rps_events = GEN6_PM_RP_DOWN_EI_EXPIRED | GEN6_PM_RP_UP_EI_EXPIRED;
-	else
-		dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
+	dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
 
 	INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,
 			  i915_hangcheck_elapsed);
Signature · 1 line
1.9.1
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#3 lore raw
Quoted 7 lines · Ville Syrjälä
Quoted 4 lines · On Thu, Mar 19, 2015 at 04:09:44PM +0530, [email protected] wrote:

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Do we want to throw out the actual code as well then?

Chris as cleaned up patches for VLV rps WA. I think its worth a try

Quoted 21 lines
Quoted 21 lines

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88012

---
  drivers/gpu/drm/i915/i915_irq.c | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +1 -5
index 6d8340d..7bbdede 100644
@@ -4241,11 +4241,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
  	INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
 
  	/* Let's track the enabled rps events */
-	if (IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv))
-		/* WaGsvRC0ResidencyMethod:vlv */
-		dev_priv->pm_rps_events = GEN6_PM_RP_DOWN_EI_EXPIRED | GEN6_PM_RP_UP_EI_EXPIRED;
-	else
-		dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
+	dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
 
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c +0 -0
  	INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,
  			  i915_hangcheck_elapsed);
Signature · 1 line
1.9.1

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

#4 lore raw
In reply to [email protected]
Quoted 4 lines · On Thu, Mar 19, 2015 at 04:09:44PM +0530, [email protected] wrote:

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Is there any way to identify either what systems it's OK to use on, or to identif what Baytrail systems it isn't OK to use on?

Just reverting this completely seems overly broad if it's possible to tell the difference between working and non-working systems.

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

author
#5 lore raw
Quoted 5 lines · David Weinehall
Quoted 4 lines · On Thu, Mar 19, 2015 at 04:09:44PM +0530, [email protected] wrote:

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Quoted 8 lines

Is there any way to identify either what systems it's OK to use on, or to identif what Baytrail systems it isn't OK to use on?

Just reverting this completely seems overly broad if it's possible to tell the difference between working and non-working systems.

Kind regards, David Weinehall

Restricting the changes to few system will be the right way to go. How do we get details of now working system?

- Deepak

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

#6 lore raw
Quoted 8 lines · Deepak S
Quoted 5 lines · David Weinehall
Quoted 4 lines · On Thu, Mar 19, 2015 at 04:09:44PM +0530, [email protected] wrote:

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Quoted 8 lines
Quoted 5 lines

Is there any way to identify either what systems it's OK to use on, or to identif what Baytrail systems it isn't OK to use on?

Just reverting this completely seems overly broad if it's possible to tell the difference between working and non-working systems.

Restricting the changes to few system will be the right way to go. How do we get details of now working system?

That depends. Who reported the non-working Baytrail-systems? And just as importantly, do we have Baytrail systems where this is confirmed to work?

If we can identify the respective revisions of the systems we might be able to discern the pattern and continue from there.

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

#7 lore raw
Quoted 18 lines · David Weinehall
Quoted 8 lines · Deepak S
Quoted 5 lines · David Weinehall
Quoted 4 lines · On Thu, Mar 19, 2015 at 04:09:44PM +0530, [email protected] wrote:

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Quoted 8 lines
Quoted 5 lines

Is there any way to identify either what systems it's OK to use on, or to identif what Baytrail systems it isn't OK to use on?

Just reverting this completely seems overly broad if it's possible to tell the difference between working and non-working systems.

Restricting the changes to few system will be the right way to go. How do we get details of now working system?

Quoted 6 lines

That depends. Who reported the non-working Baytrail-systems? And just as importantly, do we have Baytrail systems where this is confirmed to work?

If we can identify the respective revisions of the systems we might be able to discern the pattern and continue from there.

My experience with random crashes with rps on snb/ivb is that there's no solid systems, just systems where no one has bothered to be really evil yet.

I'd be really cautious with whitelisting since it tends to not really solve the underlying bug (if there is one), usually blows up really fast in size and is long-term unmaintainable. We've been there a few times with other hacks and issues :(
-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
maintainer
#8 lore raw
Quoted 26 lines · Daniel Vetter
Quoted 18 lines · David Weinehall
Quoted 8 lines · Deepak S
Quoted 5 lines · David Weinehall
Quoted 4 lines · On Thu, Mar 19, 2015 at 04:09:44PM +0530, [email protected] wrote:

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Quoted 8 lines
Quoted 5 lines

Is there any way to identify either what systems it's OK to use on, or to identif what Baytrail systems it isn't OK to use on?

Just reverting this completely seems overly broad if it's possible to tell the difference between working and non-working systems.

Restricting the changes to few system will be the right way to go. How do we get details of now working system?

Quoted 6 lines

That depends. Who reported the non-working Baytrail-systems? And just as importantly, do we have Baytrail systems where this is confirmed to work?

If we can identify the respective revisions of the systems we might be able to discern the pattern and continue from there.

Quoted 8 lines

My experience with random crashes with rps on snb/ivb is that there's no solid systems, just systems where no one has bothered to be really evil yet.

I'd be really cautious with whitelisting since it tends to not really solve the underlying bug (if there is one), usually blows up really fast in size and is long-term unmaintainable. We've been there a few times with other hacks and issues :(

Plenty of talk but no final verdict on the patch either way, and the bug is still open too. :(

Deepak, is this patch still needed?

BR,
Jani.

Quoted 9 lines

-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
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#9 lore raw
Quoted 31 lines · Jani Nikula
Quoted 22 lines · Daniel Vetter
Quoted 13 lines · David Weinehall
Quoted 12 lines · Deepak S
Quoted 10 lines · David Weinehall
Quoted 4 lines · On Thu, Mar 19, 2015 at 04:09:44PM +0530, [email protected] wrote:

From: Deepak S <[email protected]>

Unfortunately WaGsvRC0ResidencyMethod causing system freeze on some of the baytrail systems :(. Switching back to legacy mode rps.

Is there any way to identify either what systems it's OK to use on, or to identif what Baytrail systems it isn't OK to use on?

Just reverting this completely seems overly broad if it's possible to tell the difference between working and non-working systems.

Quoted 8 lines
Quoted 2 lines

Restricting the changes to few system will be the right way to go. How do we get details of now working system?

That depends. Who reported the non-working Baytrail-systems? And just as importantly, do we have Baytrail systems where this is confirmed to work?

If we can identify the respective revisions of the systems we might be able to discern the pattern and continue from there.

Quoted 8 lines

My experience with random crashes with rps on snb/ivb is that there's no solid systems, just systems where no one has bothered to be really evil yet.

I'd be really cautious with whitelisting since it tends to not really solve the underlying bug (if there is one), usually blows up really fast in size and is long-term unmaintainable. We've been there a few times with other hacks and issues :(

Quoted 7 lines

Plenty of talk but no final verdict on the patch either way, and the bug is still open too. :(

Deepak, is this patch still needed?

BR,
Jani.

Hi Jani,

Chris has cleaned up patches for "WA for Turbo and RC6 to work" & these patches are helping to resolve freeze issue. We can ignore this patch. :)

Thanks
Deepak

Quoted 4 lines
Quoted 9 lines
Quoted 9 lines

-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

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

Tested-by on v1 1/1
#10 lore raw
In reply to [email protected]

Task id: 6004 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 272/272 271/272

ILK                                  301/301              301/301
SNB                                  303/303              303/303
IVB                                  342/342              342/342
BYT                                  287/287              287/287
HSW                                  362/362              362/362
BDW                                  308/308              308/308

-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
PNV igt_gem_userptr_blits_minor-sync-interruptible DMESG_WARN(1)PASS(2) DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx