aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2014-04-01 13:55:11 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-04-01 16:53:44 -0400
commita23dc6584f2961b0888e24270a29d67a2f22a75b (patch)
treede4ed00b6464defae164fae84543c7e4bdd0adf1
parentb0e5ddf3236bca2c67f7b4454b1c2ba520149c23 (diff)
drm/i915: don't read cursor registers on powered down pipes
At i915_display_info, don't call cursor_position() for a disabled CRTC, since the CRTC may be on a powered down pipe, and this will cause "Unclaimed register before interrupt" error messages. 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.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 23a65168d5ba..2bf7c42268e1 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2334,14 +2334,15 @@ static int i915_display_info(struct seq_file *m, void *unused)
2334 seq_printf(m, "CRTC %d: pipe: %c, active: %s\n", 2334 seq_printf(m, "CRTC %d: pipe: %c, active: %s\n",
2335 crtc->base.base.id, pipe_name(crtc->pipe), 2335 crtc->base.base.id, pipe_name(crtc->pipe),
2336 yesno(crtc->active)); 2336 yesno(crtc->active));
2337 if (crtc->active) 2337 if (crtc->active) {
2338 intel_crtc_info(m, crtc); 2338 intel_crtc_info(m, crtc);
2339 2339
2340 active = cursor_position(dev, crtc->pipe, &x, &y); 2340 active = cursor_position(dev, crtc->pipe, &x, &y);
2341 seq_printf(m, "\tcursor visible? %s, position (%d, %d), addr 0x%08x, active? %s\n", 2341 seq_printf(m, "\tcursor visible? %s, position (%d, %d), addr 0x%08x, active? %s\n",
2342 yesno(crtc->cursor_visible), 2342 yesno(crtc->cursor_visible),
2343 x, y, crtc->cursor_addr, 2343 x, y, crtc->cursor_addr,
2344 yesno(active)); 2344 yesno(active));
2345 }
2345 } 2346 }
2346 2347
2347 seq_printf(m, "\n"); 2348 seq_printf(m, "\n");