From mboxrd@z Thu Jan 1 00:00:00 1970 From: przanoni@gmail.com Subject: [PATCH] drm/i915: set the right SDVO transcoder for CPT Date: Thu, 13 Oct 2011 09:49:19 -0300 Message-ID: <1318510159-12913-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-yw0-f49.google.com (mail-yw0-f49.google.com [209.85.213.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E4A99E7B3 for ; Thu, 13 Oct 2011 05:49:53 -0700 (PDT) Received: by ywf9 with SMTP id 9so1316796ywf.36 for ; Thu, 13 Oct 2011 05:49:53 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni Fixes fd.o #41272 Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_sdvo.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) It would be nice to have this in Kernel 3.1 too 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