git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5748ee
)
drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP)
author
Adam Jackson
<ajax@redhat.com>
Fri, 7 Oct 2011 18:38:43 +0000
(14:38 -0400)
committer
Ben Hutchings
<ben@decadent.org.uk>
Wed, 19 Sep 2012 14:04:30 +0000
(15:04 +0100)
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
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index
3eed270
..
e89ddbf
100644
(file)
--- 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));
}