diff options
| author | Paulo Zanoni | 2014-04-01 19:55:11 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-04-01 22:53:44 +0200 |
| commit | a23dc6584f2961b0888e24270a29d67a2f22a75b (patch) | |
| tree | de4ed00b6464defae164fae84543c7e4bdd0adf1 /drivers/gpu/drm/i915 | |
| parent | drm/i915: get runtime PM at i915_display_info (diff) | |
| download | kernel-qcow2-linux-a23dc6584f2961b0888e24270a29d67a2f22a75b.tar.gz kernel-qcow2-linux-a23dc6584f2961b0888e24270a29d67a2f22a75b.tar.xz kernel-qcow2-linux-a23dc6584f2961b0888e24270a29d67a2f22a75b.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 13 |
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) seq_printf(m, "CRTC %d: pipe: %c, active: %s\n", crtc->base.base.id, pipe_name(crtc->pipe), yesno(crtc->active)); - if (crtc->active) + if (crtc->active) { intel_crtc_info(m, crtc); - active = cursor_position(dev, crtc->pipe, &x, &y); - seq_printf(m, "\tcursor visible? %s, position (%d, %d), addr 0x%08x, active? %s\n", - yesno(crtc->cursor_visible), - x, y, crtc->cursor_addr, - yesno(active)); + active = cursor_position(dev, crtc->pipe, &x, &y); + seq_printf(m, "\tcursor visible? %s, position (%d, %d), addr 0x%08x, active? %s\n", + yesno(crtc->cursor_visible), + x, y, crtc->cursor_addr, + yesno(active)); + } } seq_printf(m, "\n"); |