aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2011-10-07 14:38:43 -0400
committerBen Hutchings <ben@decadent.org.uk>2012-09-19 15:04:30 +0100
commitcaac26534f1b995a1c985bb316ce9f4cbadfbaf8 (patch)
tree7f069977290e0ecf2c2adb033f5423e554124560
parente5748ee03b46dab9048e38b04602eefbf648a0d2 (diff)
drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP)
commit 23c99e775d14f01ba45a5affd2fb51af4328359c upstream. Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-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 3eed270f3b0..e89ddbf5b98 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1073,7 +1073,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));
}