From patchwork Thu Oct 18 08:15:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1609301 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 5801BDFB34 for ; Thu, 18 Oct 2012 09:54:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4604EA09F4 for ; Thu, 18 Oct 2012 02:54:35 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id D7464A09E4 for ; Thu, 18 Oct 2012 01:15:47 -0700 (PDT) Received: by mail-ea0-f177.google.com with SMTP id n13so2028716eaa.36 for ; Thu, 18 Oct 2012 01:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=KTmHzlr+K2eHwYL+KZH1SkAIBdyDgr8EZTK2iD1Yulw=; b=HBXi1KLu9NR6MmhhNy+kpB5ULL8CCbaYvF7wIxnxPcM9fqaYlQxlXRl8ZMA6qBxyHS 5aKAQhVU4XKdtkUcL77cJzuYqWS/TmzcdHa0dRznpo+eh0rOH2f6Sjj0/p/oQF7nBSwr gkmxMqE3wJXmbs0w1JbmTQqGaJevryX/gja3w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=KTmHzlr+K2eHwYL+KZH1SkAIBdyDgr8EZTK2iD1Yulw=; b=WHfkD5R5x7uATl++hZAHAa1Va27XMjcgHG8bksSzbIZ4eFcibdO321sAA0r4AJKOLB 7n7LzCw4Ykt1LuhatfuuArf6hcb8rgjf1wGW64pC5/HomNriVqhF7dx+IWEFb3A4+wZB vtCH1igITTvicMDGZGFvvw+yS7uKnChNYec6iVPe5ddQ9lWbyajMHiNJwUFuiHQmhO4U L2rtmAeGXF6S0Du8J2MOtDSahk7q46gR6qN2owMACkm5rVznAMBc7j4sfxBN037kjEsC pnE6v3yUzohHjX4sHMPiGK4o6LJweaxqyA/YpqCDBB+QUbTwCepDf69z0EGiSXjxITLX YTBw== Received: by 10.14.199.132 with SMTP id x4mr30544549een.37.1350548146885; Thu, 18 Oct 2012 01:15:46 -0700 (PDT) Received: from bremse.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id 42sm38586341eee.0.2012.10.18.01.15.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 01:15:46 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 18 Oct 2012 10:15:30 +0200 Message-Id: <1350548132-3037-9-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1350548132-3037-1-git-send-email-daniel.vetter@ffwll.ch> References: <1350548132-3037-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQkizUWpNR7wp7DKBA2bOCBRaPv24P6YrN4ZLg7OU8384hhzbOdtGi8r0uCZSLrJaQ3ylrNW Cc: nouveau@lists.freedesktop.org, Intel Graphics Development , xorg-driver-ati@lists.x.org, Daniel Vetter Subject: [Intel-gfx] [PATCH 08/10] drm/i915: use the new dp train delay helpers 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 Only really required for dp 1.2. I've hoped this would help with some link training woes I'm fighting, but alas those are only dp 1.1 devices. Also move a comment that went misplaced in the recent refactorings to the right spot again. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_dp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index aa1a28c..865f7f3 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1806,13 +1806,13 @@ intel_dp_start_link_train(struct intel_dp *intel_dp) DRM_DEBUG_KMS("training pattern 1 signal levels %08x\n", signal_levels); + /* Set training pattern 1 */ if (!intel_dp_set_link_train(intel_dp, DP, DP_TRAINING_PATTERN_1 | DP_LINK_SCRAMBLING_DISABLE)) break; - /* Set training pattern 1 */ - udelay(100); + drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd); if (!intel_dp_get_link_status(intel_dp, link_status)) { DRM_ERROR("failed to get link status\n"); break; @@ -1900,7 +1900,7 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp) DP_LINK_SCRAMBLING_DISABLE)) break; - udelay(400); + drm_dp_link_train_channel_eq_delay(intel_dp->dpcd); if (!intel_dp_get_link_status(intel_dp, link_status)) break;