From patchwork Thu Oct 24 16:45:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 11210285 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 12C0A1747 for ; Thu, 24 Oct 2019 16:46:23 +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 EEEB420659 for ; Thu, 24 Oct 2019 16:46:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EEEB420659 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 D400D6E4C9; Thu, 24 Oct 2019 16:46:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 257F06E4BB for ; Thu, 24 Oct 2019 16:46:02 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id q13so21890205wrs.12 for ; Thu, 24 Oct 2019 09:46:02 -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=Yty/EJuHbPo+sV+vw2W6VylZ7J8vhVAzp70Ulfh9+0w=; b=sH3WyTrPYHhxPQak8qoSkfUrp35mW7SnqTj5B6TEecgllUE+jqcHWtcGzykf3q6ekc AI4iHj9NkgTcyvKNdP7rOA9+3DFqAyu+XnnXy9ZZuDxjCflLXlkd5iD2a+V9Pp1mR++H FnkIlRpYO2AHr/VWFRUP2/Df+lqrargqMj/mF4/uovawya3r5aMCj0NokUDX3xi7CASJ nGnTM75b2waFYVroY3AyWyPipVZbDqUSr9FmX6V78Fzs7yVeaexLNjcxAxC0i8rXhDDg 2rsTTB9QLaJWJMau5gYwWBVhPxlT9FWFZLP/phSGxKVktzpOX6WHxJ1hXXCQQx5g2W6y spsg== X-Gm-Message-State: APjAAAX1ya44gOzGA6R8UVceKNjTSbeMlKnWR3FG6b52meHWd3klg1Om VaGxkWsT2aOuf42q7CcBSik= X-Google-Smtp-Source: APXvYqwCFC6iF6CMbRgp6QF+yXHQtCqN51M4/rI8h1YavptNKwRXtJXI6zlQTsvG9F9hgqpdktAg3A== X-Received: by 2002:adf:a48c:: with SMTP id g12mr4473270wrb.212.1571935559735; Thu, 24 Oct 2019 09:45:59 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id p1sm3658391wmg.11.2019.10.24.09.45.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 09:45:58 -0700 (PDT) From: Thierry Reding To: Thierry Reding Subject: [PATCH 10/32] drm/tegra: dp: Read eDP version from DPCD Date: Thu, 24 Oct 2019 18:45:12 +0200 Message-Id: <20191024164534.132764-11-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191024164534.132764-1-thierry.reding@gmail.com> References: <20191024164534.132764-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=Yty/EJuHbPo+sV+vw2W6VylZ7J8vhVAzp70Ulfh9+0w=; b=XhRXcDJ0B/zJO6GUyxCfZStm1mqzsaFnI3qf5hqPARKj4v55F4UNEGAjVr07eQlZTL tDugAZbbwl6PGa3htJmzf3TLaVtra2qQ4c9v7k8rWCo9PaJKp0DXmuidAWxXX2lX9ast i0ohrEAkh/HoQ34k6OO824pIXjXXZP4i9y1HmGkpEgD1EMNdTQvgSGWl+w4PnnSJleFN 6zfA+e2pHLLZH/SUiF3V3iiXVKprW5bVKt8+d5rMmQMc3uL0TYdtMtQdXfLSFKiqqbQC 7z80ZtPNugV3exg1SPmfmqyiNXmsY8U/+cUKVcegxbZur1hMwIzwG3gY6u7W3hGWH9WF FruQ== 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: , Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Thierry Reding If the sink supports eDP, read the eDP revision from it's DPCD. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/dp.c | 18 ++++++++++++++++-- drivers/gpu/drm/tegra/dp.h | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tegra/dp.c b/drivers/gpu/drm/tegra/dp.c index 1f48c2190e3b..2be0a47ecbec 100644 --- a/drivers/gpu/drm/tegra/dp.c +++ b/drivers/gpu/drm/tegra/dp.c @@ -5,9 +5,12 @@ */ #include +#include #include "dp.h" +static const u8 drm_dp_edp_revisions[] = { 0x11, 0x12, 0x13, 0x14 }; + static void drm_dp_link_caps_reset(struct drm_dp_link_caps *caps) { caps->enhanced_framing = false; @@ -37,6 +40,7 @@ static void drm_dp_link_reset(struct drm_dp_link *link) link->max_lanes = 0; drm_dp_link_caps_reset(&link->caps); + link->edp = 0; link->rate = 0; link->lanes = 0; @@ -55,7 +59,7 @@ static void drm_dp_link_reset(struct drm_dp_link *link) */ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link) { - u8 dpcd[DP_RECEIVER_CAP_SIZE]; + u8 dpcd[DP_RECEIVER_CAP_SIZE], value; int err; drm_dp_link_reset(link); @@ -73,9 +77,19 @@ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link) link->caps.fast_training = drm_dp_fast_training_cap(dpcd); link->caps.channel_coding = drm_dp_channel_coding_supported(dpcd); - if (drm_dp_alternate_scrambler_reset_cap(dpcd)) + if (drm_dp_alternate_scrambler_reset_cap(dpcd)) { link->caps.alternate_scrambler_reset = true; + err = drm_dp_dpcd_readb(aux, DP_EDP_DPCD_REV, &value); + if (err < 0) + return err; + + if (value >= ARRAY_SIZE(drm_dp_edp_revisions)) + DRM_ERROR("unsupported eDP version: %02x\n", value); + else + link->edp = drm_dp_edp_revisions[value]; + } + link->rate = link->max_rate; link->lanes = link->max_lanes; diff --git a/drivers/gpu/drm/tegra/dp.h b/drivers/gpu/drm/tegra/dp.h index 45e8ff18ab6a..681cbd0a0094 100644 --- a/drivers/gpu/drm/tegra/dp.h +++ b/drivers/gpu/drm/tegra/dp.h @@ -60,6 +60,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) + * @edp: eDP revision (0x11: eDP 1.1, 0x12: eDP 1.2, ...) * @rate: currently configured link rate * @lanes: currently configured number of lanes */ @@ -69,6 +70,7 @@ struct drm_dp_link { unsigned int max_lanes; struct drm_dp_link_caps caps; + unsigned char edp; unsigned int rate; unsigned int lanes;