From: Paulo Zanoni Subject: [RFC 09/30] drm/i915: add DP support to intel_ddi_pll_mode_set Date: Tue, 28 Aug 2012 19:06:40 -0300 Message-ID: <1346191621-12996-10-git-send-email-przanoni@gmail.com> References: <1346191621-12996-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-f53.google.com (mail-yw0-f53.google.com [209.85.213.53]) by gabe.freedesktop.org (Postfix) with ESMTP id A37399EFC5 for ; Tue, 28 Aug 2012 15:07:34 -0700 (PDT) Received: by mail-yw0-f53.google.com with SMTP id 3so1991825yhp.26 for ; Tue, 28 Aug 2012 15:07:34 -0700 (PDT) In-Reply-To: <1346191621-12996-1-git-send-email-przanoni@gmail.com> 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 Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_ddi.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 33b3a75..dd28e35 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -642,18 +642,23 @@ bool intel_ddi_pll_mode_set(struct drm_crtc *crtc) struct drm_i915_private *dev_priv = dev->dev_private; struct intel_encoder *intel_encoder; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - bool is_hdmi = false, is_crt = false; - int port, i, to_use, num_encoders = 0; + bool is_hdmi = false, is_crt = false, is_dp = false; + int port = I915_MAX_PORTS, i, to_use, num_encoders = 0; bool wrpll_used[] = {false, false}; bool spll_used = false; uint32_t wrpll_reg[] = {WRPLL_CTL1, WRPLL_CTL2}; uint32_t wrpll_sel[] = {PORT_CLK_SEL_WRPLL1, PORT_CLK_SEL_WRPLL2}; uint32_t temp; + struct intel_dp *intel_dp = NULL; + struct intel_hdmi *intel_hdmi = NULL; for_each_encoder_on_crtc(dev, crtc, intel_encoder) { - struct intel_hdmi *intel_hdmi; - switch (intel_encoder->type) { + case INTEL_OUTPUT_DISPLAYPORT: + is_dp = true; + intel_dp = enc_to_intel_dp(&intel_encoder->base); + port = intel_dp->port; + break; case INTEL_OUTPUT_HDMI: is_hdmi = true; intel_hdmi = enc_to_intel_hdmi(&intel_encoder->base); @@ -678,6 +683,11 @@ bool intel_ddi_pll_mode_set(struct drm_crtc *crtc) return false; } + if (port == I915_MAX_PORTS) { + WARN(1, "No port selected\n"); + return false; + } + for (i = PORT_A; i <= PORT_E; i++) { if (i == port) continue; @@ -695,7 +705,26 @@ bool intel_ddi_pll_mode_set(struct drm_crtc *crtc) } } - if (is_hdmi) { + if (is_dp) { + switch (intel_dp->link_bw) { + case DP_LINK_BW_1_62: + temp = PORT_CLK_SEL_LCPLL_810; + break; + case DP_LINK_BW_2_7: + temp = PORT_CLK_SEL_LCPLL_1350; + break; + case DP_LINK_BW_5_4: + temp = PORT_CLK_SEL_LCPLL_2700; + break; + default: + DRM_ERROR("Link bandwidth %d unsupported\n", + intel_dp->link_bw); + return false; + } + + I915_WRITE(PORT_CLK_SEL(port), temp); + + } else if (is_hdmi) { int p, n2, r2; for (i = 0; i < ARRAY_SIZE(wrpll_reg); i++) -- 1.7.11.2