From: Paulo Zanoni Subject: [RFC 10/30] drm/i915: add DP support to intel_ddi_disable_port Date: Tue, 28 Aug 2012 19:06:41 -0300 Message-ID: <1346191621-12996-11-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 A086A9EFC5 for ; Tue, 28 Aug 2012 15:07:36 -0700 (PDT) Received: by mail-yw0-f53.google.com with SMTP id 3so1991825yhp.26 for ; Tue, 28 Aug 2012 15:07:36 -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 Just a missing register. There is no problem to run this code when the output is HDMI. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_ddi.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index dd28e35..fed7856 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -961,15 +961,25 @@ static void intel_ddi_disable_port(struct drm_i915_private *dev_priv, enum port port) { uint32_t reg, val; + bool wait = false; reg = DDI_BUF_CTL(port); val = I915_READ(reg); if (val & DDI_BUF_CTL_ENABLE) { val &= ~DDI_BUF_CTL_ENABLE; I915_WRITE(reg, val); - intel_wait_ddi_buf_idle(dev_priv, port); + wait = true; } + reg = DP_TP_CTL(port); + val = I915_READ(reg); + val &= ~(DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_MASK); + val |= DP_TP_CTL_LINK_TRAIN_PAT1; + I915_WRITE(reg, val); + + if (wait) + intel_wait_ddi_buf_idle(dev_priv, port); + switch (I915_READ(PORT_CLK_SEL(port))) { case PORT_CLK_SEL_WRPLL1: reg = WRPLL_CTL1; -- 1.7.11.2