From patchwork Mon Sep 2 11:31:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 11126455 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F37814F7 for ; Mon, 2 Sep 2019 11:31:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8785B22DBF for ; Mon, 2 Sep 2019 11:31:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8785B22DBF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C16AF89C1C; Mon, 2 Sep 2019 11:31:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id ABA9789C18 for ; Mon, 2 Sep 2019 11:31:54 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id o184so14223092wme.3 for ; Mon, 02 Sep 2019 04:31:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gPcDkSG7gGNdAp3jF4yBee9f6RzA+evCrH2htnpmEAI=; b=kIQ4g6JYb/jtUex34f+S0a6SzUhvQhPjL9ek6XNbpmQw53GOF5cBkvqlFQ2ZdO0ug/ nMD4k64L27Ya91ucjLlZ7npm/QHawETV4ruFFJLq9gJRjRSJYqxLJhSyDnuDtoHpRsNs lWTfWFjACJG+u86vaiw8qb0irkRlpJNQbvPaQ5pIhrmpgnSky8nUUOir7ZXw1tn2DdDd /eVfh1cPhJiIrbdFBplp618h9gT5piFGtHRIQu8XwriNl4oIjKc9k6XSlZzj+i/4a+s0 g+20nzxpAZG02AHJ3Qh33zYeZeAW9K49xHgRm0Ex4i31nqqjfpzIjgUHQNuL1s7SiFv+ ebxg== X-Gm-Message-State: APjAAAUIWOG4WCgnvemlHszo845+hz34fzGUO1DSAkwxZta+WIMjBxip +/8CQ0IVRH38NG/wWcE9IE+9v+Q6 X-Google-Smtp-Source: APXvYqxOREgolMdzNUytaoZjrD7kMzyGHI21uXVQD2wJ0yDQ4lKo4GZpkkVY+CWNKRxa1kQOg9qgfQ== X-Received: by 2002:a7b:cf37:: with SMTP id m23mr7988392wmg.53.1567423912812; Mon, 02 Sep 2019 04:31:52 -0700 (PDT) Received: from localhost (pD9E51890.dip0.t-ipconnect.de. [217.229.24.144]) by smtp.gmail.com with ESMTPSA id d9sm1189091wrc.39.2019.09.02.04.31.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 04:31:51 -0700 (PDT) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 14/21] drm/dp: Use drm_dp_aux_rd_interval() Date: Mon, 2 Sep 2019 13:31:14 +0200 Message-Id: <20190902113121.31323-15-thierry.reding@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190902113121.31323-1-thierry.reding@gmail.com> References: <20190902113121.31323-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gPcDkSG7gGNdAp3jF4yBee9f6RzA+evCrH2htnpmEAI=; b=dHubGBMv74RuakGRYYWlVjNHgjyyuqS2zA0Uc4+AYhweoJ5fh2ihEdSGRhVFEO3ToU rcVepDTM26lfRoY9AT75RiX+4JgA3rfd3Mcw+NDUTM1nHZ2FxurVvyQZO+6rgam2PrkQ Sf8JPLUKYGJ9WBS4Ql5EuWk8j/JJ0CsHi8bBtqjAWVWozzzxqGEY8NSzCBl7UOuByt5l jAkoVaMVNUCNE04tY4862pZFL7lbQpadviaYpdU9k3CfMmSSDcLxp49Cy/l0puXn7npL 84QIzc7D6DIhejF2PRgqMrQNFz8Cs7WGkN5bZ//TGhJs5AKXO+MOAGGm/dMKMivKirny 0zSA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Thierry Reding Make use of the newly added drm_dp_aux_rd_interval() helper in existing DP link training helpers. v2: drop stale sentence from commit message (Philipp Zabel) Signed-off-by: Thierry Reding --- drivers/gpu/drm/drm_dp_helper.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 681d28988776..1fb3c27cd012 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -122,17 +122,7 @@ EXPORT_SYMBOL(drm_dp_get_adjust_request_pre_emphasis); void drm_dp_link_train_clock_recovery_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]) { - unsigned int rd_interval = dpcd[DP_TRAINING_AUX_RD_INTERVAL] & - DP_TRAINING_AUX_RD_MASK; - - if (rd_interval > 4) - DRM_DEBUG_KMS("AUX interval %u, out of range (max 4)\n", - rd_interval); - - if (rd_interval == 0 || dpcd[DP_DPCD_REV] >= DP_DPCD_REV_14) - rd_interval = 100; - else - rd_interval *= 4 * USEC_PER_MSEC; + unsigned int rd_interval = drm_dp_aux_rd_interval(dpcd); usleep_range(rd_interval, rd_interval * 2); } @@ -140,19 +130,9 @@ EXPORT_SYMBOL(drm_dp_link_train_clock_recovery_delay); void drm_dp_link_train_channel_eq_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]) { - unsigned int rd_interval = dpcd[DP_TRAINING_AUX_RD_INTERVAL] & - DP_TRAINING_AUX_RD_MASK; - - if (rd_interval > 4) - DRM_DEBUG_KMS("AUX interval %u, out of range (max 4)\n", - rd_interval); + unsigned int min = drm_dp_aux_rd_interval(dpcd); - if (rd_interval == 0) - rd_interval = 400; - else - rd_interval *= 4 * USEC_PER_MSEC; - - usleep_range(rd_interval, rd_interval * 2); + usleep_range(min, min * 2); } EXPORT_SYMBOL(drm_dp_link_train_channel_eq_delay);