From 356c8382fb294d915719276ab33e9e689b33756a Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Tue, 11 Oct 2011 14:38:08 -0300 Subject: [PATCH] drm/i915: set the right SDVO transcoder for CPT Fixes fd.o #41272 Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_sdvo.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index aa94110..c66c0b4 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1080,8 +1080,16 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, } sdvox |= (9 << 19) | SDVO_BORDER_ENABLE; } - if (intel_crtc->pipe == 1) + + if (intel_sdvo->sdvo_reg == PCH_SDVOB) { + if (HAS_PCH_IBX(dev)) + sdvox |= TRANSCODER(intel_crtc->pipe); + else + sdvox |= PORT_TRANS_SEL_CPT(intel_crtc->pipe); + } else if (intel_crtc->pipe == 1) { sdvox |= SDVO_PIPE_B_SELECT; + } + if (intel_sdvo->has_hdmi_audio) sdvox |= SDVO_AUDIO_ENABLE; -- 1.7.6.3