diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-04-01 13:55:10 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-01 16:53:43 -0400 |
commit | b0e5ddf3236bca2c67f7b4454b1c2ba520149c23 (patch) | |
tree | 0df437cdd1bbfeee4393410ac0f24cb51d1856da | |
parent | efbc20abd826033859cc28d1442e48640cf09045 (diff) |
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 <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) | |||
2319 | { | 2319 | { |
2320 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 2320 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
2321 | struct drm_device *dev = node->minor->dev; | 2321 | struct drm_device *dev = node->minor->dev; |
2322 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
2322 | struct intel_crtc *crtc; | 2323 | struct intel_crtc *crtc; |
2323 | struct drm_connector *connector; | 2324 | struct drm_connector *connector; |
2324 | 2325 | ||
2326 | intel_runtime_pm_get(dev_priv); | ||
2325 | drm_modeset_lock_all(dev); | 2327 | drm_modeset_lock_all(dev); |
2326 | seq_printf(m, "CRTC info\n"); | 2328 | seq_printf(m, "CRTC info\n"); |
2327 | seq_printf(m, "---------\n"); | 2329 | seq_printf(m, "---------\n"); |
@@ -2349,6 +2351,7 @@ static int i915_display_info(struct seq_file *m, void *unused) | |||
2349 | intel_connector_info(m, connector); | 2351 | intel_connector_info(m, connector); |
2350 | } | 2352 | } |
2351 | drm_modeset_unlock_all(dev); | 2353 | drm_modeset_unlock_all(dev); |
2354 | intel_runtime_pm_put(dev_priv); | ||
2352 | 2355 | ||
2353 | return 0; | 2356 | return 0; |
2354 | } | 2357 | } |