| Date | Mon, 17 Sep 2012 01:36:37 +0100 | From | Ben Hutchings <> | Subject | [ 012/135] drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP) |
| |
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Jackson <ajax@redhat.com>
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> --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d775f95..3e21f3c 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)); }
|