drm/i915/debugfs: Take runtime_pm ref for sseu
authorDavid Weinehall <david.weinehall@linux.intel.com>
Mon, 1 Aug 2016 14:33:27 +0000 (17:33 +0300)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 1 Aug 2016 14:52:54 +0000 (15:52 +0100)
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".

Signed-off-by: David Weinehall <david.weinehall@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470062007-26996-1-git-send-email-david.weinehall@linux.intel.com
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_debugfs.c

index 9aa62c5b5f6551ea76771bd3be3bb1df7682c806..531ca0221c7f6c60da442728df75c535e888e1b8 100644 (file)
@@ -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",