From patchwork Thu Nov 1 20:45:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 1686331 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 DA068DFE75 for ; Thu, 1 Nov 2012 20:45:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BEC4D9F018 for ; Thu, 1 Nov 2012 13:45:28 -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 A49F99E852 for ; Thu, 1 Nov 2012 13:45:15 -0700 (PDT) Received: by mail-gg0-f177.google.com with SMTP id h1so562632gge.36 for ; Thu, 01 Nov 2012 13:45:15 -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; bh=Te2omXorqt+sDuEUKR/w5hVFkuKJX9JE6w9XGgEW2BE=; b=hnrXE1H+7UWJPjR05NbFnK87IMnM+X0pkgBSKKJBZELbQHn14+QkRT4j7jTFbIIFOm V39h6j34gEuLmED7HmiF1FK6QiolGppKxfvR3XQjT4+E6mH4/xg51ldm4u/3M4DakBVp v8t16OzWfWwzsnqd5j3bXtELp+NENEB3cySoPyrnRuJT7l+Bfo+oQLOCDtH8YXZjtGXI MDYfsoIp1OK/ilJjzPLzwSDVHQfO//lN60NYXW9ndyj70AVRh6zuLH9hZQi97IcDwbud igcxZlgtH7m77zGPRfuVFmcRPmyZHGBSEwg6/W3cjGebSAt+IDH/ZZH2j8SxSV1SjrU+ k6Og== Received: by 10.236.134.112 with SMTP id r76mr40872080yhi.34.1351802714974; Thu, 01 Nov 2012 13:45:14 -0700 (PDT) Received: from vicky.domain.invalid ([177.96.15.240]) by mx.google.com with ESMTPS id h16sm7201966ani.0.2012.11.01.13.45.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Nov 2012 13:45:14 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 1 Nov 2012 18:45:04 -0200 Message-Id: <1351802707-4924-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 1/4] drm/i915: set the correct number of FDI lanes on Haswell 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 We had 2 places using X2 and one place using X1. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_ddi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 67bd6ba..a7a555f 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -171,7 +171,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc) I915_WRITE(DDI_BUF_CTL(PORT_E), temp | DDI_BUF_CTL_ENABLE | - DDI_PORT_WIDTH_X2 | + ((intel_crtc->fdi_lanes - 1) << 1) | hsw_ddi_buf_ctl_values[i]); udelay(600); @@ -193,7 +193,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc) FDI_RX_ENABLE | FDI_LINK_TRAIN_PATTERN_1_CPT | FDI_RX_ENHANCE_FRAME_ENABLE | - FDI_PORT_WIDTH_2X_LPT | + ((intel_crtc->fdi_lanes - 1) << 19) | FDI_RX_PLL_ENABLE); POSTING_READ(reg); udelay(100); @@ -952,6 +952,7 @@ void intel_ddi_enable_pipe_func(struct drm_crtc *crtc) } else if (type == INTEL_OUTPUT_ANALOG) { temp |= TRANS_DDI_MODE_SELECT_FDI; + temp |= (intel_crtc->fdi_lanes - 1) << 1; } else if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {