From patchwork Thu Apr 28 22:12:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 739871 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3SMHs3h025139 for ; Thu, 28 Apr 2011 22:18:14 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F40869E967 for ; Thu, 28 Apr 2011 15:17:44 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy5-pub.bluehost.com (oproxy5-pub.bluehost.com [67.222.39.38]) by gabe.freedesktop.org (Postfix) with SMTP id E25B49E92C for ; Thu, 28 Apr 2011 15:13:24 -0700 (PDT) Received: (qmail 3657 invoked by uid 0); 28 Apr 2011 22:13:20 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by cpoproxy2.bluehost.com with SMTP; 28 Apr 2011 22:13:20 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-Identified-User; b=sH9r+51GGseKI9QGr1NpL1K/cnnZkzoEz0LsO8CDpq3pFgmKGcmFd9vY7+9Xx+T5saiaCD3+3hFOj3tlBiBwGK7iRnaqtvSFPUI6j9E82NstxDJV9TcnY4L8ox2J0NDz; Received: from c-67-161-37-189.hsd1.ca.comcast.net ([67.161.37.189] helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1QFZSS-00041D-0W; Thu, 28 Apr 2011 16:13:12 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Apr 2011 15:12:55 -0700 Message-Id: <1304028785-10583-10-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1304028785-10583-1-git-send-email-jbarnes@virtuousgeek.org> References: <1304028785-10583-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 09/19] drm/i915: automatic FDI training support for Ivy Bridge X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 28 Apr 2011 22:18:14 +0000 (UTC) Ivy Bridge supports auto-training on the CPU side, so add a separate training function to handle it. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 82 +++++++++++++++++++++++++++++++-- 2 files changed, 79 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index aba3fe5..03c99ed 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -3116,6 +3116,8 @@ #define FDI_LINK_TRAIN_AUTO (1<<10) #define FDI_SCRAMBLING_ENABLE (0<<7) #define FDI_SCRAMBLING_DISABLE (1<<7) +/* Ivybridge */ +#define FDI_AUTO_TRAIN_DONE (1<<1) /* FDI_RX, FDI_X is hard-wired to Transcoder_X */ #define _FDI_RXA_CTL 0xf000c diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ab840a6..3396043 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2411,6 +2411,75 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc) DRM_DEBUG_KMS("FDI train done.\n"); } +/* On Ivybridge we can use auto training */ +static void ivb_fdi_link_train(struct drm_crtc *crtc) +{ + struct drm_device *dev = crtc->dev; + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); + unsigned long start = jiffies_to_msecs(jiffies); + int pipe = intel_crtc->pipe; + u32 reg, temp, i, j; + + /* Can't pair IVB & Ibex Peak */ + BUG_ON(HAS_PCH_IBX(dev)); + + reg = FDI_TX_CTL(pipe); + temp = I915_READ(reg); + temp &= ~(7 << 19); + temp |= (intel_crtc->fdi_lanes - 1) << 19; + temp &= ~FDI_LINK_TRAIN_NONE; + I915_WRITE(reg, temp); + + /* Enable auto training on TX and RX */ + for (i = 0; i < ARRAY_SIZE(snb_b_fdi_train_param); i++) { + /* Try each vswing/pre-emphasis pair twice */ + for (j = 0; j < 2; j++) { + reg = FDI_TX_CTL(pipe); + temp = I915_READ(reg); + temp |= FDI_AUTO_TRAINING; + temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK; + temp |= snb_b_fdi_train_param[i]; + I915_WRITE(reg, temp | FDI_TX_ENABLE); + + reg = FDI_RX_CTL(pipe); + temp = I915_READ(reg); + I915_WRITE(reg, temp | FDI_RX_ENABLE); + POSTING_READ(reg); + + udelay(5); + + reg = FDI_TX_CTL(pipe); + temp = I915_READ(reg); + if ((temp & FDI_AUTO_TRAIN_DONE) || + (I915_READ(reg) & FDI_AUTO_TRAIN_DONE)) { + DRM_DEBUG_KMS("FDI auto train complete in %d ms\n", + jiffies_to_msecs(jiffies) - start); + goto done; + } + + reg = FDI_TX_CTL(pipe); + temp = I915_READ(reg); + I915_WRITE(reg, temp & ~FDI_TX_ENABLE); + + reg = FDI_RX_CTL(pipe); + temp = I915_READ(reg); + I915_WRITE(reg, temp & ~FDI_RX_ENABLE); + POSTING_READ(reg); + udelay(31); /* wait idle time before retrying */ + } + } + DRM_ERROR("FDI auto train failed\n"); + return; + +done: + reg = FDI_RX_CTL(pipe); + temp = I915_READ(reg); + temp |= FDI_FS_ERR_CORRECT_ENABLE | FDI_FE_ERR_CORRECT_ENABLE; + I915_WRITE(reg, temp); + POSTING_READ(reg); +} + static void ironlake_fdi_pll_enable(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev; @@ -2452,7 +2521,7 @@ static void ironlake_fdi_pll_enable(struct drm_crtc *crtc) } } -static void ironlake_fdi_disable(struct drm_crtc *crtc) +static void ironlake_fdi_pll_disable(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -2674,9 +2743,9 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) is_pch_port = intel_crtc_driving_pch(crtc); if (is_pch_port) - ironlake_fdi_enable(crtc); + ironlake_fdi_pll_enable(crtc); else - ironlake_fdi_disable(crtc); + ironlake_fdi_pll_disable(crtc); /* Enable panel fitting for LVDS */ if (dev_priv->pch_pf_size && @@ -2729,7 +2798,7 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) I915_WRITE(PF_CTL(pipe), 0); I915_WRITE(PF_WIN_SZ(pipe), 0); - ironlake_fdi_disable(crtc); + ironlake_fdi_pll_disable(crtc); /* This is a horrible layering violation; we should be doing this in * the connector/encoder ->prepare instead, but we don't always have @@ -7418,7 +7487,10 @@ static void intel_init_display(struct drm_device *dev) dev_priv->display.fdi_link_train = gen6_fdi_link_train; } else if (IS_IVYBRIDGE(dev)) { /* FIXME: detect B0+ stepping and use auto training */ - dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; + if (0) + dev_priv->display.fdi_link_train = ivb_fdi_link_train; + else + dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; } else dev_priv->display.update_wm = NULL; } else if (IS_PINEVIEW(dev)) {