From patchwork Fri Oct 23 10:01:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ander Conselvan de Oliveira X-Patchwork-Id: 7471481 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 27BFA9F71A for ; Fri, 23 Oct 2015 10:02:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3EE532085F for ; Fri, 23 Oct 2015 10:02:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 543D8206E3 for ; Fri, 23 Oct 2015 10:02:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 07CE4721CD; Fri, 23 Oct 2015 03:02:54 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id C2174721C4 for ; Fri, 23 Oct 2015 03:02:51 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 23 Oct 2015 03:02:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,186,1444719600"; d="scan'208";a="586573864" Received: from linux.intel.com ([10.23.219.25]) by FMSMGA003.fm.intel.com with ESMTP; 23 Oct 2015 03:02:41 -0700 Received: from localhost (aconselv-mobl3.ger.corp.intel.com [10.252.19.216]) by linux.intel.com (Postfix) with ESMTP id 96A6B6A4087; Fri, 23 Oct 2015 03:01:39 -0700 (PDT) From: Ander Conselvan de Oliveira To: intel-gfx@lists.freedesktop.org, jim.bride@linux.intel.com, sivakumar.thulasimani@intel.com Date: Fri, 23 Oct 2015 13:01:56 +0300 Message-Id: <1445594525-7174-14-git-send-email-ander.conselvan.de.oliveira@intel.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1445594525-7174-1-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1445594525-7174-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Cc: Ander Conselvan de Oliveira Subject: [Intel-gfx] [PATCH 13/22] drm/i915: Move the voltage changed check into intel_get_adjust_train() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move the check of whether the voltage changed into the function that parses the sink adjust request, simplifying the voltage loop a bit. Signed-off-by: Ander Conselvan de Oliveira --- drivers/gpu/drm/i915/intel_dp_link_training.c | 32 ++++++++++++++------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/intel_dp_link_training.c index 0da2133..fb449f5 100644 --- a/drivers/gpu/drm/i915/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/intel_dp_link_training.c @@ -23,7 +23,8 @@ #include "intel_drv.h" -static void +/* Returns true if the voltage swing changed */ +static bool intel_get_adjust_train(struct intel_dp *intel_dp, const uint8_t link_status[DP_LINK_STATUS_SIZE]) { @@ -32,6 +33,8 @@ intel_get_adjust_train(struct intel_dp *intel_dp, int lane; uint8_t voltage_max; uint8_t preemph_max; + uint8_t mask; + bool voltage_changed = false; for (lane = 0; lane < intel_dp->lane_count; lane++) { uint8_t this_v = drm_dp_get_adjust_request_voltage(link_status, lane); @@ -51,8 +54,16 @@ intel_get_adjust_train(struct intel_dp *intel_dp, if (p >= preemph_max) p = preemph_max | DP_TRAIN_MAX_PRE_EMPHASIS_REACHED; - for (lane = 0; lane < 4; lane++) + mask = DP_TRAIN_VOLTAGE_SWING_MASK | DP_TRAIN_MAX_SWING_REACHED; + + for (lane = 0; lane < 4; lane++) { + if ((intel_dp->train_set[lane] & mask) != v) + voltage_changed = true; + intel_dp->train_set[lane] = v | p; + } + + return voltage_changed; } static bool @@ -147,17 +158,10 @@ max_voltage_reached_on_all_lanes(struct intel_dp *intel_dp) return true; } -static uint8_t -intel_dp_get_train_voltage(struct intel_dp *intel_dp) -{ - return intel_dp->train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK; -} - static bool clock_recovery_voltage_step(struct intel_dp *intel_dp) { int voltage_tries = 0; - uint8_t voltage = 0xff; for (;;) { uint8_t link_status[DP_LINK_STATUS_SIZE]; @@ -186,18 +190,16 @@ clock_recovery_voltage_step(struct intel_dp *intel_dp) if (max_voltage_reached_on_all_lanes(intel_dp)) break; - /* Check to see if we've tried the same voltage 5 times */ - if (intel_dp_get_train_voltage(intel_dp) != voltage) { + /* Update training set and check to see if we've tried the same + * voltage 5 times */ + if (intel_get_adjust_train(intel_dp, link_status)) { voltage_tries = 0; } else if (++voltage_tries == 5) { DRM_ERROR("too many voltage retries, give up\n"); break; } - voltage = intel_dp_get_train_voltage(intel_dp); - - /* Update training set as requested by target */ - intel_get_adjust_train(intel_dp, link_status); + /* Make the new training set effective */ if (!intel_dp_update_link_train(intel_dp)) { DRM_ERROR("failed to update link training\n"); break;