Skip to contentSkip to conversation

drm/i915: add missing forcewake put on i915_wa_registers()

PATCH In review Paulo Zanoni 4 participants 5 messages Oct 21, 2014 – Oct 23, 2014

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

PATCH 1/1 drm/i915: add missing forcewake put on i915_wa_registers()

From: Paulo Zanoni <[email protected]>

Otherwise, a simple "cat" to the debugfs file can make the machine use much more power than needed, and prevent it from runtime suspending.

Related commit:

commit 8452e1d173a16d9812422a2272c4ab0f0ba81057
Author: Mika Kuoppala <[email protected]>
Date: Tue Oct 7 17:21:26 2014 +0300
drm/i915: Build workaround list in ring initialization

Cc: Mika Kuoppala <[email protected]>
Cc: Arun Siluvery <[email protected]>
Testcase: igt/pm_rpm/debugfs-read

---
 drivers/gpu/drm/i915/i915_debugfs.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 9600285..36a4baa 100644
@@ -2671,6 +2671,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)
 			   addr, value, mask, read, ok ? "OK" : "FAIL");
 	}
 
+	gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
 	intel_runtime_pm_put(dev_priv);
 	mutex_unlock(&dev->struct_mutex);
 
Signature · 1 line
2.1.1
#1 lore raw
Quoted 12 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Otherwise, a simple "cat" to the debugfs file can make the machine use much more power than needed, and prevent it from runtime suspending.

Related commit:

commit 8452e1d173a16d9812422a2272c4ab0f0ba81057
Author: Mika Kuoppala <[email protected]>
Date: Tue Oct 7 17:21:26 2014 +0300
drm/i915: Build workaround list in ring initialization

Quoted 4 lines

Cc: Mika Kuoppala <[email protected]>
Cc: Arun Siluvery <[email protected]>
Testcase: igt/pm_rpm/debugfs-read

tbh I'm not even sure we want to do the manual forcewake get here - I915_READ will do it for us, and this is a debug interface. So no one should care about perf. Mika, is that right? If so I'd like to merge the inverse patch which drops the fw_get.
-Daniel

Quoted 23 lines
---
 drivers/gpu/drm/i915/i915_debugfs.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 9600285..36a4baa 100644
@@ -2671,6 +2671,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)
 			   addr, value, mask, read, ok ? "OK" : "FAIL");
 	}
 
+	gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
 	intel_runtime_pm_put(dev_priv);
 	mutex_unlock(&dev->struct_mutex);
 
Signature · 6 lines
2.1.1

_______________________________________________
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
#2 lore raw
Quoted 18 lines · Daniel Vetter
Quoted 12 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Otherwise, a simple "cat" to the debugfs file can make the machine use much more power than needed, and prevent it from runtime suspending.

Related commit:

commit 8452e1d173a16d9812422a2272c4ab0f0ba81057
Author: Mika Kuoppala <[email protected]>
Date: Tue Oct 7 17:21:26 2014 +0300
drm/i915: Build workaround list in ring initialization

Quoted 4 lines

Cc: Mika Kuoppala <[email protected]>
Cc: Arun Siluvery <[email protected]>
Testcase: igt/pm_rpm/debugfs-read

Quoted 4 lines

tbh I'm not even sure we want to do the manual forcewake get here - I915_READ will do it for us, and this is a debug interface. So no one should care about perf. Mika, is that right? If so I'd like to merge the inverse patch which drops the fw_get.

Don't we still need the idle msg disable+poll CSPWRFSM trick here on gen8? That also needs forcewake around it.

Quoted 34 lines

-Daniel

Quoted 23 lines
---
 drivers/gpu/drm/i915/i915_debugfs.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 9600285..36a4baa 100644
@@ -2671,6 +2671,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)
 			   addr, value, mask, read, ok ? "OK" : "FAIL");
 	}
 
+	gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
 	intel_runtime_pm_put(dev_priv);
 	mutex_unlock(&dev->struct_mutex);
 
Signature · 6 lines
2.1.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä
Intel OTC
#3 lore raw
Quoted 19 lines · Ville Syrjälä
Quoted 18 lines · Daniel Vetter
Quoted 16 lines · Paulo Zanoni

From: Paulo Zanoni <[email protected]>

Otherwise, a simple "cat" to the debugfs file can make the machine use much more power than needed, and prevent it from runtime suspending.

Related commit:

commit 8452e1d173a16d9812422a2272c4ab0f0ba81057
Author: Mika Kuoppala <[email protected]>
Date: Tue Oct 7 17:21:26 2014 +0300
drm/i915: Build workaround list in ring initialization

Cc: Mika Kuoppala <[email protected]>
Cc: Arun Siluvery <[email protected]>
Testcase: igt/pm_rpm/debugfs-read

Quoted 8 lines
Quoted 4 lines

tbh I'm not even sure we want to do the manual forcewake get here - I915_READ will do it for us, and this is a debug interface. So no one should care about perf. Mika, is that right? If so I'd like to merge the inverse patch which drops the fw_get.

Don't we still need the idle msg disable+poll CSPWRFSM trick here on gen8? That also needs forcewake around it.

I had a chat with Mika on this yesterday and he seem to agree that forcewake is probably not required here. I couldn't send the patch yesterday but as per Ville's comments looks like we need forcewake here?

regards
Arun

Quoted 35 lines
Quoted 34 lines

-Daniel

Quoted 19 lines
---
  drivers/gpu/drm/i915/i915_debugfs.c | 1 +
  1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
index 9600285..36a4baa 100644
@@ -2671,6 +2671,7 @@ static int i915_wa_registers(struct seq_file *m, void *unused)
  			   addr, value, mask, read, ok ? "OK" : "FAIL");
  	}
 
+	gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
  	intel_runtime_pm_put(dev_priv);
  	mutex_unlock(&dev->struct_mutex);
 
--

2.1.1

Quoted 4 lines

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

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

2014-10-22 6:56 GMT-02:00 Siluvery, Arun <[email protected]>:

Quoted 30 lines · Ville Syrjälä
Quoted 29 lines · Daniel Vetter
Quoted 25 lines · Paulo Zanoni
Quoted 13 lines

From: Paulo Zanoni <[email protected]>

Otherwise, a simple "cat" to the debugfs file can make the machine use much more power than needed, and prevent it from runtime suspending.

Related commit:

commit 8452e1d173a16d9812422a2272c4ab0f0ba81057
Author: Mika Kuoppala <[email protected]>
Date: Tue Oct 7 17:21:26 2014 +0300
drm/i915: Build workaround list in ring initialization

Quoted 4 lines

Cc: Mika Kuoppala <[email protected]>
Cc: Arun Siluvery <[email protected]>
Testcase: igt/pm_rpm/debugfs-read

tbh I'm not even sure we want to do the manual forcewake get here - I915_READ will do it for us, and this is a debug interface. So no one should care about perf. Mika, is that right? If so I'd like to merge the inverse patch which drops the fw_get.

Quoted 7 lines
Quoted 3 lines

Don't we still need the idle msg disable+poll CSPWRFSM trick here on gen8? That also needs forcewake around it.

I had a chat with Mika on this yesterday and he seem to agree that forcewake is probably not required here. I couldn't send the patch yesterday but as per Ville's comments looks like we need forcewake here?

Looks like Daniel removed the forcewake get from the original patch.

Quoted 49 lines

regards
Arun

Quoted 23 lines
Quoted 23 lines

-Daniel

Quoted 21 lines
---
  drivers/gpu/drm/i915/i915_debugfs.c | 1 +
  1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
index 9600285..36a4baa 100644
@@ -2671,6 +2671,7 @@ static int i915_wa_registers(struct seq_file *m,
 void *unused)
                           addr, value, mask, read, ok ? "OK" : "FAIL");
        }
 
+       gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
        intel_runtime_pm_put(dev_priv);
        mutex_unlock(&dev->struct_mutex);
 
--

2.1.1

Quoted 16 lines
Quoted 6 lines
Quoted 4 lines

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

Quoted 8 lines

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - 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

Signature · 5 lines
Paulo Zanoni
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx