summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2011-10-07 20:38:43 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-17 12:52:15 +0100
commit23c99e775d14f01ba45a5affd2fb51af4328359c (patch)
treedf87d629c2c0f61c73368988189455a3d1d555dd /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Implement plane-disabled assertion for PCH too (diff)
downloadlinux-23c99e775d14f01ba45a5affd2fb51af4328359c.tar.xz
linux-23c99e775d14f01ba45a5affd2fb51af4328359c.zip
drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP)
Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d775f954c1b6..3e21f3cb7879 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1096,7 +1096,7 @@ static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv,
{
u32 val = I915_READ(reg);
WARN(hdmi_pipe_enabled(dev_priv, val, pipe),
- "PCH DP (0x%08x) enabled on transcoder %c, should be disabled\n",
+ "PCH HDMI (0x%08x) enabled on transcoder %c, should be disabled\n",
reg, pipe_name(pipe));
}