From patchwork Wed Oct 31 20:12:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1681411 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 8BD0ADFB80 for ; Wed, 31 Oct 2012 20:22:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7095CA0C0B for ; Wed, 31 Oct 2012 13:22:17 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-gg0-f177.google.com (mail-gg0-f177.google.com [209.85.161.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B6A0A0295 for ; Wed, 31 Oct 2012 13:13:37 -0700 (PDT) Received: by mail-gg0-f177.google.com with SMTP id h1so348839gge.36 for ; Wed, 31 Oct 2012 13:13:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=UbxJmC8i8F1elixqsTpVCG9Bm1CT/vu4avHD10vYzEE=; b=IDsZoRBdPSaxDzCkVuAIXMhJHLWJyin64/0RY0kSRvD39D7j4bNTTtoUoE0yy+ko80 dSdKdmvyYffP5q+kbcG1PkY1bnGkM/URNSDZ9XeeSP2TL8FY8/BmL6tHtTWp7koblM1X KX8iDKNR9YxS1jtzyLRCNf88EWg824Prc36dQmJ+ngSUr7atB/LTKOeXJgJyNIPdD4oZ eE+kkk4KiJgeyQTdrPSMtb3tUfg193Yosiz4yIxJuSH9qEMsSIIPAeDmqLvQ0t2ouo3J wxeDDHXsirVhKCjP9o7S91/GnCjGe2BVq844ZV7Q9KpWVLuvZZ1UbqSS90pWqWOAIIU9 gJnw== Received: by 10.236.176.8 with SMTP id a8mr37309339yhm.54.1351714417328; Wed, 31 Oct 2012 13:13:37 -0700 (PDT) Received: from vicky.domain.invalid ([177.42.7.91]) by mx.google.com with ESMTPS id h16sm4354130ani.0.2012.10.31.13.13.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 13:13:36 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 31 Oct 2012 18:12:35 -0200 Message-Id: <1351714375-15284-17-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351714375-15284-1-git-send-email-przanoni@gmail.com> References: <1351714375-15284-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 16/36] drm/i915: try each voltage twice at hsw_fdi_link_train X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 From: Paulo Zanoni From the mode set sequence document: "Each setting should be tried at least twice before failing mode set". Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_ddi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index f8ca3c4..94c6b76 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -179,7 +179,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc) I915_WRITE(PORT_CLK_SEL(PORT_E), intel_crtc->ddi_pll_sel); /* Start the training iterating through available voltages and emphasis */ - for (i=0; i < ARRAY_SIZE(hsw_ddi_buf_ctl_values); i++) { + for (i = 0; i < ARRAY_SIZE(hsw_ddi_buf_ctl_values) * 2; i++) { /* Configure DP_TP_CTL with auto-training */ I915_WRITE(DP_TP_CTL(PORT_E), DP_TP_CTL_FDI_AUTOTRAIN | @@ -191,7 +191,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc) I915_WRITE(DDI_BUF_CTL(PORT_E), DDI_BUF_CTL_ENABLE | ((intel_crtc->fdi_lanes - 1) << 1) | - hsw_ddi_buf_ctl_values[i]); + hsw_ddi_buf_ctl_values[i >> 1]); POSTING_READ(DDI_BUF_CTL(PORT_E)); udelay(600);