From patchwork Mon Feb 5 19:38:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10201627 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2BA4F602CA for ; Mon, 5 Feb 2018 19:39:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C7FA2875A for ; Mon, 5 Feb 2018 19:39:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10EAB28807; Mon, 5 Feb 2018 19:39:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B5ED52875A for ; Mon, 5 Feb 2018 19:39:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 291686E341; Mon, 5 Feb 2018 19:39:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x241.google.com (mail-qt0-x241.google.com [IPv6:2607:f8b0:400d:c0d::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8BF406E340 for ; Mon, 5 Feb 2018 19:39:00 +0000 (UTC) Received: by mail-qt0-x241.google.com with SMTP id r13so7679889qtm.8 for ; Mon, 05 Feb 2018 11:39:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=RyIRuGs94bwSQpQDE4oui1+1qCOL2t4dcXYO1aGnLAY=; b=fIY2HrN/qRgf4FMBczDdWuY9WgefdB9RAZct35e7LpPsFfSxy/GO0VBOmNhX/mIISU APO5J0NFMn6cJ1ggTDN/o4i2QmTlgDy9Fh1kK2Ao4XB2LUxHhqEGKHPw/m8doflB6XBf RwaTnSSVeWZ47yOirgt4K2zkhP7nMOE+WRIjDNQT6nUyMReRJ5xthp6QadP6HH3BOToh O624vLx08IbE5Zuz+ZxjuP0I8ZuoYgJsgsGHUs2bZuvKNjLAyTuqe8dY/crCmjWPox8c BtPBtjITkN+LWmzv0NvB48ebkAvYviGi0j/MLlNW2IZdEMpn3bXCUPah9EcGYoj870vt 0Ykw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=RyIRuGs94bwSQpQDE4oui1+1qCOL2t4dcXYO1aGnLAY=; b=TV7aV6/JvcykVxEUVj6sjYIoT7i3fw5gIMw8RAJj6ojX1oBiC8X2WP75I1CBzhi8aC Bv6n9aU1r0k9LevGE4w3d2U7CNSTBK5ViLZluH3MaoOmsL02LRh+gBqOYJVY/QbAQo9q WItBVk+yn28PcLakBOE2f1KEYgQ8RjhAI/4LvpsBt7yx86xYgpP3m3FNlaFJ0UYUzvIV kQYSpecO9MXzbXPeMI1JV3L3JSSnl3wAPNllIcuQpKHQIMh4zXea7pcWs7UwsNa6dcUm f8wisgAWeOPsfASalnBS2/ombNJtTvGat29tn+37HQkWoZBH4zDEJA9PF52q5KCc9/lW Y3zA== X-Gm-Message-State: APf1xPD4JfZrYfeulC4s73WWiOteMkkXIUfJbDf8wjQwBNMwzA9539DG GEqNadngPnAhOEtkL67Ynu35Lw== X-Google-Smtp-Source: AH8x224LGem5zmDcS/OJwhlu8FkRfWrzfNezwEjITAVLLPbPmuwJPNZfAZiv7nNeVklU5RdPEVVgEA== X-Received: by 10.200.27.238 with SMTP id m43mr2622097qtk.212.1517859539529; Mon, 05 Feb 2018 11:38:59 -0800 (PST) Received: from localhost (p200300E41F41B00009B231EAB1BE76D4.dip0.t-ipconnect.de. [2003:e4:1f41:b000:9b2:31ea:b1be:76d4]) by smtp.gmail.com with ESMTPSA id 20sm5847791qtr.19.2018.02.05.11.38.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Feb 2018 11:38:58 -0800 (PST) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [PATCH 11/17] drm/dp: Read AUX read interval from DPCD Date: Mon, 5 Feb 2018 20:38:21 +0100 Message-Id: <20180205193827.20374-12-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180205193827.20374-1-thierry.reding@gmail.com> References: <20180205193827.20374-1-thierry.reding@gmail.com> 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding Store the AUX read interval from DPCD, so that it can be used to wait for the durations given in the specification during link training. Signed-off-by: Thierry Reding --- drivers/gpu/drm/drm_dp_helper.c | 3 +++ include/drm/drm_dp_helper.h | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index c78cc62f149f..0d9d5360465c 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -361,6 +361,7 @@ static void drm_dp_link_reset(struct drm_dp_link *link) link->max_lanes = 0; drm_dp_link_caps_reset(&link->caps); + link->aux_rd_interval = 0; link->edp = 0; link->rate = 0; @@ -414,6 +415,8 @@ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link) link->edp = edp_revs[value]; } + link->aux_rd_interval = drm_dp_aux_rd_interval(values); + link->rate = link->max_rate; link->lanes = link->max_lanes; diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 705c56ebe74d..8213f1c53f9b 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -997,6 +997,22 @@ drm_dp_alternate_scrambler_reset_cap(const u8 dpcd[DP_RECEIVER_CAP_SIZE]) DP_ALTERNATE_SCRAMBLER_RESET_CAP; } +/** + * drm_dp_read_aux_interval() - read the AUX read interval from the DPCD + * @dpcd: receiver capacity buffer + * + * Reads the AUX read interval (in microseconds) from the DPCD. Note that the + * TRAINING_AUX_RD_INTERVAL stores the value in units of 4 milliseconds. + * + * Returns: + * The read AUX interval in microseconds. + */ +static inline unsigned int +drm_dp_aux_rd_interval(const u8 dpcd[DP_RECEIVER_CAP_SIZE]) +{ + return dpcd[DP_TRAINING_AUX_RD_INTERVAL] * 4000; +} + /* * DisplayPort AUX channel */ @@ -1146,6 +1162,7 @@ void drm_dp_link_caps_copy(struct drm_dp_link_caps *dest, * @max_rate: maximum clock rate supported on the link * @max_lanes: maximum number of lanes supported on the link * @caps: capabilities supported on the link (see &drm_dp_link_caps) + * @aux_rd_interval: AUX read interval to use for training (in microseconds) * @edp: eDP revision (0x11: eDP 1.1, 0x12: eDP 1.2, ...) * @rate: currently configured link rate * @lanes: currently configured number of lanes @@ -1156,6 +1173,7 @@ struct drm_dp_link { unsigned int max_lanes; struct drm_dp_link_caps caps; + unsigned int aux_rd_interval; unsigned char edp; unsigned int rate;