projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3b095b
)
drm/i915: enable HDMI on Cougarpoint
author
Zhenyu Wang
<zhenyuw@linux.intel.com>
Wed, 7 Apr 2010 08:15:57 +0000
(16:15 +0800)
committer
Eric Anholt
<eric@anholt.net>
Mon, 12 Apr 2010 16:23:43 +0000
(09:23 -0700)
Fix transcoder select bit for HDMI on CPT.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/intel_hdmi.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_hdmi.c
b/drivers/gpu/drm/i915/intel_hdmi.c
index
78cb775
..
5ff5802
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_hdmi.c
+++ b/
drivers/gpu/drm/i915/intel_hdmi.c
@@
-61,8
+61,12
@@
static void intel_hdmi_mode_set(struct drm_encoder *encoder,
if (hdmi_priv->has_hdmi_sink)
sdvox |= SDVO_AUDIO_ENABLE;
- if (intel_crtc->pipe == 1)
- sdvox |= SDVO_PIPE_B_SELECT;
+ if (intel_crtc->pipe == 1) {
+ if (HAS_PCH_CPT(dev))
+ sdvox |= PORT_TRANS_B_SEL_CPT;
+ else
+ sdvox |= SDVO_PIPE_B_SELECT;
+ }
I915_WRITE(hdmi_priv->sdvox_reg, sdvox);
POSTING_READ(hdmi_priv->sdvox_reg);