From patchwork Mon Feb 5 19:38:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10201625 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 89C49602CA for ; Mon, 5 Feb 2018 19:39:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 787DE205FC for ; Mon, 5 Feb 2018 19:39:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D441287DA; Mon, 5 Feb 2018 19:39:19 +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 CEF242875A for ; Mon, 5 Feb 2018 19:39:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 67D616E33B; Mon, 5 Feb 2018 19:38:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x243.google.com (mail-qk0-x243.google.com [IPv6:2607:f8b0:400d:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3BAC6E33B for ; Mon, 5 Feb 2018 19:38:57 +0000 (UTC) Received: by mail-qk0-x243.google.com with SMTP id w128so11717801qkb.5 for ; Mon, 05 Feb 2018 11:38:57 -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=VRlIV5OmokOWQYi8ypDaHloQcgdnxku0wvzywrP59eg=; b=oRZzSjuLI2hfcJyuZ5zfN4xy9qIWMYSWWC4LmXyNgm/QEgmzns/2ySFcBx2klfto5N pXZ5pJ9HeUEHFL9KGK4RO6dIpX3ERsOvOW+hirFKIWNbOprIo1srPpC+YoFuXeiOCY2M amWoEg1BdEg4tUsLK/MBCmb0J3HU6Zo2Fd8umvBFTO6Ky3bLt9JLKj44pFxJy0FlNfEM Yho6U84Yf/KVp6eGnirdHiwi+Frowq3h4IXBbf3c4e/YZkUC0x1YUBvJj20ihqObIptE ug3Nop2F/7kaI/j4+7bDam8zGCF/Re7b6XGiKmS2N94B5j1RhuJzUsQ2fVaJUhEuiHvA 1SFw== 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=VRlIV5OmokOWQYi8ypDaHloQcgdnxku0wvzywrP59eg=; b=iFkUC1xKwke5qcQzvci4JxLMJ7DVn6RhV95zTiYLChZW51GrEHDLLuTa8w6wfi7oDD CK4Rglp3DkWNtertVC3bHb9SmDViv8vxKphIbRoO5jXoPR/1yRfFX7trQ3Sa77gVapfP iIjSJgKswMknTkKKIm+mBNzn+pdOEZEsN5ygSwqfjWlnRBWzNGpjALZ1SY1WMuFfBOIY Hbc2977DQVmVWhX77ml7W0x+IdL4H8w6qWbI6JpSnLTNXIatxKgUO9fD9+15Z3oL47va HyAHTNtweTJHfLxIta6gl36iM51ZoE/FpU4R3r8SZTclTFpVP2FtPdoxZCifL70lzONU OWdw== X-Gm-Message-State: APf1xPCKLvQ7bu3II+MbjCMjBx0R2PeqE8vAq6A7/fJ3UTHOTGfaglyV i2PrZaa2Oai73ptuLbGz1B2JUQ== X-Google-Smtp-Source: AH8x227iqK0rT/72lz1BPhNUeHIxqXO6GJeDEYAXI/2NG/yDuRXKRPVbbmkXGOCfHjsT2UPBK5tpUg== X-Received: by 10.55.209.87 with SMTP id s84mr5627217qki.324.1517859536763; Mon, 05 Feb 2018 11:38:56 -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 s64sm2729904qks.38.2018.02.05.11.38.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Feb 2018 11:38:56 -0800 (PST) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [PATCH 10/17] drm/dp: Read eDP version from DPCD Date: Mon, 5 Feb 2018 20:38:20 +0100 Message-Id: <20180205193827.20374-11-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 If the sink supports eDP, read the eDP revision from it's DPCD. Signed-off-by: Thierry Reding --- drivers/gpu/drm/drm_dp_helper.c | 16 +++++++++++++++- include/drm/drm_dp_helper.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 23429a53452d..c78cc62f149f 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->edp = 0; link->rate = 0; link->lanes = 0; @@ -397,9 +398,22 @@ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link) link->caps.fast_training = drm_dp_fast_training_cap(values); link->caps.channel_coding = drm_dp_channel_coding_supported(values); - if (drm_dp_alternate_scrambler_reset_cap(values)) + if (drm_dp_alternate_scrambler_reset_cap(values)) { + static const u8 edp_revs[] = { 0x11, 0x12, 0x13, 0x14 }; + u8 value; + 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(edp_revs)) + DRM_ERROR("unsupported eDP version: %02x\n", value); + else + link->edp = edp_revs[value]; + } + 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 c52b6cf96a81..705c56ebe74d 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -1146,6 +1146,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 */ @@ -1155,6 +1156,7 @@ struct drm_dp_link { unsigned int max_lanes; struct drm_dp_link_caps caps; + unsigned char edp; unsigned int rate; unsigned int lanes;