Skip to contentSkip to conversation

drm/i915/debugfs: Take runtime_pm ref for sseu

PATCH In review David Weinehall 4 participants 4 messages Aug 1, 2016

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

PATCH 1/1 drm/i915/debugfs: Take runtime_pm ref for sseu

When reading the SSEU statistics, we need to call intel_runtime_pm_get() first, otherwise we might end up triggering "Device suspended during HW access".

---
 drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +8 -1
index 9aa62c5b5f65..531ca0221c7f 100644
@@ -5238,7 +5238,8 @@ static void broadwell_sseu_device_status(struct drm_device *dev,
 static int i915_sseu_status(struct seq_file *m, void *unused)
 {
 	struct drm_info_node *node = (struct drm_info_node *) m->private;
-	struct drm_device *dev = node->minor->dev;
+	struct drm_i915_private *dev_priv = to_i915(node->minor->dev);
+	struct drm_device *dev = &dev_priv->drm;
 	struct sseu_dev_status stat;
 
 	if (INTEL_INFO(dev)->gen < 8)
@@ -5268,6 +5269,9 @@ static int i915_sseu_status(struct seq_file *m, void *unused)
 
 	seq_puts(m, "SSEU Device Status\n");
 	memset(&stat, 0, sizeof(stat));
+
+	intel_runtime_pm_get(dev_priv);
+
 	if (IS_CHERRYVIEW(dev)) {
 		cherryview_sseu_device_status(dev, &stat);
 	} else if (IS_BROADWELL(dev)) {
@@ -5275,6 +5279,9 @@ static int i915_sseu_status(struct seq_file *m, void *unused)
 	} else if (INTEL_INFO(dev)->gen >= 9) {
 		gen9_sseu_device_status(dev, &stat);
 	}
+
+	intel_runtime_pm_put(dev_priv);
+
 	seq_printf(m, "  Enabled Slice Total: %u\n",
 		   stat.slice_total);
 	seq_printf(m, "  Enabled Subslice Total: %u\n",
Signature · 6 lines
2.8.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · David Weinehall

When reading the SSEU statistics, we need to call intel_runtime_pm_get() first, otherwise we might end up triggering "Device suspended during HW access".

Quoted 38 lines

---
 drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++++-

 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -1
index 9aa62c5b5f65..531ca0221c7f 100644
@@ -5238,7 +5238,8 @@ static void broadwell_sseu_device_status(struct drm_device *dev,
  static int i915_sseu_status(struct seq_file *m, void *unused)
  {
  	struct drm_info_node *node = (struct drm_info_node *) m->private;
-	struct drm_device *dev = node->minor->dev;
+	struct drm_i915_private *dev_priv = to_i915(node->minor->dev);
+	struct drm_device *dev = &dev_priv->drm;
  	struct sseu_dev_status stat;


  if (INTEL_INFO(dev)->gen < 8)

drivers/gpu/drm/i915/i915_debugfs.c +0 -0
@@ -5268,6 +5269,9 @@ static int i915_sseu_status(struct seq_file *m, void *unused)


  seq_puts(m, "SSEU Device Status\n");
  memset(&stat, 0, sizeof(stat));

drivers/gpu/drm/i915/i915_debugfs.c +3 -0
+
+	intel_runtime_pm_get(dev_priv);
+

  if (IS_CHERRYVIEW(dev)) { cherryview_sseu_device_status(dev, &stat); } else if (IS_BROADWELL(dev)) {

drivers/gpu/drm/i915/i915_debugfs.c +3 -0
@@ -5275,6 +5279,9 @@ static int i915_sseu_status(struct seq_file *m, void *unused)
  	} else if (INTEL_INFO(dev)->gen >= 9) {
  		gen9_sseu_device_status(dev, &stat);
  	}
+
+	intel_runtime_pm_put(dev_priv);
+
  	seq_printf(m, "  Enabled Slice Total: %u\n",
  		   stat.slice_total);
  	seq_printf(m, "  Enabled Subslice Total: %u\n",
Signature · 7 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 8 lines · Joonas Lahtinen
Quoted 5 lines · David Weinehall

When reading the SSEU statistics, we need to call intel_runtime_pm_get() first, otherwise we might end up triggering "Device suspended during HW access".

Confidently pushed, thanks.
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

✗ Ro.CI.BAT: failure for drm/i915/debugfs: Take runtime_pm ref for sseu

In reply to David Weinehall
== Series Details ==

== Series Details ==

Series: drm/i915/debugfs: Take runtime_pm ref for sseu
URL : https://patchwork.freedesktop.org/series/10455/
State : failure

== Summary ==

Series 10455v1 drm/i915/debugfs: Take runtime_pm ref for sseu
http://patchwork.freedesktop.org/api/1.0/series/10455/revisions/1/mbox

Test drv_module_reload_basic:

                skip       -> PASS       (ro-ivb-i7-3770)
Test gem_exec_gttfill:
        Subgroup basic:
                skip       -> PASS       (fi-snb-i7-2600)
Test kms_cursor_legacy:
        Subgroup basic-cursor-vs-flip-varying-size:
                pass       -> FAIL       (ro-ilk1-i5-650)
        Subgroup basic-flip-vs-cursor-legacy:
                pass       -> FAIL       (fi-hsw-i7-4770k)
                pass       -> FAIL       (fi-skl-i7-6700k)
        Subgroup basic-flip-vs-cursor-varying-size:
                fail       -> PASS       (ro-hsw-i7-4770r)
                fail       -> PASS       (ro-bdw-i5-5250u)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> INCOMPLETE (fi-hsw-i7-4770k)
                dmesg-warn -> PASS       (ro-bdw-i7-5557U)
fi-hsw-i7-4770k  total:200  pass:178  dwarn:0   dfail:0   fail:1   skip:20 
fi-kbl-qkkr      total:239  pass:180  dwarn:29  dfail:0   fail:4   skip:26 
fi-skl-i5-6260u  total:239  pass:223  dwarn:0   dfail:0   fail:2   skip:14 
fi-skl-i7-6700k  total:239  pass:207  dwarn:0   dfail:0   fail:4   skip:28 
fi-snb-i7-2600   total:239  pass:197  dwarn:0   dfail:0   fail:0   skip:42 
ro-bdw-i5-5250u  total:239  pass:219  dwarn:4   dfail:0   fail:0   skip:16 
ro-bdw-i7-5557U  total:239  pass:223  dwarn:0   dfail:0   fail:0   skip:16 
ro-bdw-i7-5600u  total:239  pass:206  dwarn:0   dfail:0   fail:1   skip:32 
ro-bsw-n3050     total:239  pass:193  dwarn:0   dfail:0   fail:4   skip:42 
ro-hsw-i3-4010u  total:239  pass:213  dwarn:0   dfail:0   fail:0   skip:26 
ro-hsw-i7-4770r  total:239  pass:213  dwarn:0   dfail:0   fail:0   skip:26 
ro-ilk-i7-620lm  total:239  pass:172  dwarn:1   dfail:0   fail:1   skip:65 
ro-ilk1-i5-650   total:234  pass:172  dwarn:0   dfail:0   fail:2   skip:60 
ro-ivb-i7-3770   total:239  pass:204  dwarn:0   dfail:0   fail:0   skip:35 
ro-ivb2-i7-3770  total:239  pass:208  dwarn:0   dfail:0   fail:0   skip:31 
ro-skl3-i5-6260u total:239  pass:221  dwarn:0   dfail:0   fail:4   skip:14 
ro-snb-i7-2620M  total:239  pass:197  dwarn:0   dfail:0   fail:1   skip:41 

ro-byt-n2820 failed to connect after reboot

Results at /archive/results/CI_IGT_test/RO_Patchwork_1655/

f1b78d2 drm-intel-nightly: 2016y-07m-29d-19h-16m-57s UTC integration manifest a275fd2 drm/i915/debugfs: Take runtime_pm ref for sseu

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