From: Adam Jackson Date: Fri, 7 Oct 2011 18:38:43 +0000 (-0400) Subject: drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP) X-Git-Tag: v3.2.30~124 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=caac26534f1b995a1c985bb316ce9f4cbadfbaf8;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP) commit 23c99e775d14f01ba45a5affd2fb51af4328359c upstream. Signed-off-by: Adam Jackson Signed-off-by: Daniel Vetter Signed-off-by: Ben Hutchings --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3eed270..e89ddbf 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)); }