dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
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	[thread overview]
Message-ID: <20190902113121.31323-15-thierry.reding@gmail.com> (raw)
In-Reply-To: <20190902113121.31323-1-thierry.reding@gmail.com>

From: Thierry Reding <treding@nvidia.com>

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 <treding@nvidia.com>
---
 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);
 
-- 
2.22.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2019-09-02 11:31 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-02 11:31 [PATCH v2 00/21] drm/dp: Various helper improvements and cleanups Thierry Reding
2019-09-02 11:31 ` [PATCH v2 01/21] drm/dp: Sort includes alphabetically Thierry Reding
2019-09-02 11:31 ` [PATCH v2 02/21] drm/dp: Add missing kerneldoc for struct drm_dp_link Thierry Reding
2019-09-02 11:31 ` [PATCH v2 03/21] drm/dp: Add drm_dp_link_reset() implementation Thierry Reding
2019-09-02 11:31 ` [PATCH v2 04/21] drm/dp: Track link capabilities alongside settings Thierry Reding
2019-09-02 11:31 ` [PATCH v2 05/21] drm/dp: Turn link capabilities into booleans Thierry Reding
2019-09-02 11:31 ` [PATCH v2 06/21] drm/dp: Probe link using existing parsing helpers Thierry Reding
2019-09-02 11:31 ` [PATCH v2 07/21] drm/dp: Read fast training capability from link Thierry Reding
2019-09-02 11:31 ` [PATCH v2 08/21] drm/dp: Read TPS3 capability from sink Thierry Reding
2019-09-02 11:31 ` [PATCH v2 09/21] drm/dp: Read channel coding " Thierry Reding
2019-09-02 11:31 ` [PATCH v2 10/21] drm/dp: Read alternate scrambler reset " Thierry Reding
2019-09-02 11:31 ` [PATCH v2 11/21] drm/dp: Read eDP version from DPCD Thierry Reding
2019-09-02 11:31 ` [PATCH v2 12/21] drm/dp: Read AUX read interval " Thierry Reding
2019-09-02 11:31 ` [PATCH v2 13/21] drm/dp: Do not busy-loop during link training Thierry Reding
2019-09-02 11:31 ` Thierry Reding [this message]
2019-09-02 11:31 ` [PATCH v2 15/21] drm/dp: Add helper to get post-cursor adjustments Thierry Reding
2019-09-02 11:31 ` [PATCH v2 16/21] drm/dp: Set channel coding on link configuration Thierry Reding
2019-09-02 11:31 ` [PATCH v2 17/21] drm/dp: Enable alternate scrambler reset when supported Thierry Reding
2019-09-02 11:31 ` [PATCH v2 18/21] drm/dp: Add drm_dp_link_choose() helper Thierry Reding
2019-09-02 11:31 ` [PATCH v2 19/21] drm/dp: Add support for eDP link rates Thierry Reding
2019-09-02 11:31 ` [PATCH v2 20/21] drm/dp: Remove a gratuituous blank line Thierry Reding
2019-09-02 11:31 ` [PATCH v2 21/21] drm/bridge: tc358767: Use DP nomenclature Thierry Reding
2019-09-20 16:00 ` [PATCH v2 00/21] drm/dp: Various helper improvements and cleanups Thierry Reding
2019-09-23 13:52   ` Jani Nikula
2019-09-23 14:52     ` Thierry Reding
2019-10-02 16:14       ` Thierry Reding
2019-10-08  9:42         ` Daniel Vetter
2019-10-08 23:05   ` Lyude Paul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190902113121.31323-15-thierry.reding@gmail.com \
    --to=thierry.reding@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox