From: Paulo Zanoni Date: Tue, 1 Apr 2014 17:55:11 +0000 (-0300) Subject: drm/i915: don't read cursor registers on powered down pipes X-Git-Tag: v3.15-rc1~51^2~1^2~7 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a23dc6584f2961b0888e24270a29d67a2f22a75b;p=karo-tx-linux.git 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 Signed-off-by: Daniel Vetter --- 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");