From patchwork Fri Apr 22 19:06:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 727841 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 p3MJ6pTh022993 for ; Fri, 22 Apr 2011 19:07:17 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 696B29F4DF for ; Fri, 22 Apr 2011 12:06:51 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy3-pub.bluehost.com (oproxy3-pub.bluehost.com [69.89.21.8]) by gabe.freedesktop.org (Postfix) with SMTP id AFDD09E807 for ; Fri, 22 Apr 2011 12:06:33 -0700 (PDT) Received: (qmail 25953 invoked by uid 0); 22 Apr 2011 19:06:33 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy3.bluehost.com with SMTP; 22 Apr 2011 19:06:33 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:To:Subject:Message-ID:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=rxMu/e6dc5bUYjgVwYCxIpCyCo3xjrOeZhUNTHl2EWipWJiOTBTD30xb8fvjYNCcRfyX4GSh6E0XS9OMp4k9P35oyFmFdX2rfDLgjyah+nmoLand1MWPEvNRg1HH1Hz+; Received: from c-67-161-37-189.hsd1.ca.comcast.net ([67.161.37.189] helo=jbarnes-desktop) by box514.bluehost.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1QDLgW-0000V0-Ts for intel-gfx@lists.freedesktop.org; Fri, 22 Apr 2011 13:06:33 -0600 Date: Fri, 22 Apr 2011 12:06:29 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Message-ID: <20110422120629.344cfef1@jbarnes-desktop> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.0; x86_64-pc-linux-gnu) Mime-Version: 1.0 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] drm/i915: remove unused variables from DP training 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: , 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]); Fri, 22 Apr 2011 19:07:18 +0000 (UTC) Leftover from the training split, we don't need these guys anymore. Signed-off-by: Jesse Barnes diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 0daefca..0558e0a 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1275,7 +1275,6 @@ intel_dp_start_link_train(struct intel_dp *intel_dp) struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.base.crtc); int i; uint8_t voltage; - bool clock_recovery = false; int tries; u32 reg; uint32_t DP = intel_dp->DP; @@ -1298,7 +1297,6 @@ intel_dp_start_link_train(struct intel_dp *intel_dp) memset(intel_dp->train_set, 0, 4); voltage = 0xff; tries = 0; - clock_recovery = false; for (;;) { /* Use intel_dp->train_set[0] to set the voltage and pre emphasis values */ uint32_t signal_levels; @@ -1324,10 +1322,8 @@ intel_dp_start_link_train(struct intel_dp *intel_dp) if (!intel_dp_get_link_status(intel_dp)) break; - if (intel_clock_recovery_ok(intel_dp->link_status, intel_dp->lane_count)) { - clock_recovery = true; + if (intel_clock_recovery_ok(intel_dp->link_status, intel_dp->lane_count)) break; - } /* Check to see if we've tried the max voltage */ for (i = 0; i < intel_dp->lane_count; i++) @@ -1357,7 +1353,6 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp) { struct drm_device *dev = intel_dp->base.base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - bool channel_eq = false; int tries, cr_tries; u32 reg; uint32_t DP = intel_dp->DP; @@ -1365,7 +1360,6 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp) /* channel equalization */ tries = 0; cr_tries = 0; - channel_eq = false; for (;;) { /* Use intel_dp->train_set[0] to set the voltage and pre emphasis values */ uint32_t signal_levels; @@ -1405,10 +1399,8 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp) continue; } - if (intel_channel_eq_ok(intel_dp)) { - channel_eq = true; + if (intel_channel_eq_ok(intel_dp)) break; - } /* Try 5 times, then try clock recovery if that fails */ if (tries > 5) {