From: Paulo Zanoni Date: Tue, 1 Apr 2014 17:55:10 +0000 (-0300) Subject: drm/i915: get runtime PM at i915_display_info X-Git-Tag: android-x86-4.4-r2~1011^2~63^2~126 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b0e5ddf3236bca2c67f7b4454b1c2ba520149c23;p=android-x86%2Fkernel.git drm/i915: get runtime PM at i915_display_info Otherwise we may get some WARNs complaining that we're reading a register while we're suspended. Testcase: igt/pm_pc8/debugfs-read Signed-off-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 7522f978677e..23a65168d5ba 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2319,9 +2319,11 @@ static int i915_display_info(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 = dev->dev_private; struct intel_crtc *crtc; struct drm_connector *connector; + intel_runtime_pm_get(dev_priv); drm_modeset_lock_all(dev); seq_printf(m, "CRTC info\n"); seq_printf(m, "---------\n"); @@ -2349,6 +2351,7 @@ static int i915_display_info(struct seq_file *m, void *unused) intel_connector_info(m, connector); } drm_modeset_unlock_all(dev); + intel_runtime_pm_put(dev_priv); return 0; }