From patchwork Wed Aug 12 15:06:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 7002661 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3FF20C05AC for ; Wed, 12 Aug 2015 15:07:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FCC920279 for ; Wed, 12 Aug 2015 15:07:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9C7D520268 for ; Wed, 12 Aug 2015 15:07:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01A6E7205A; Wed, 12 Aug 2015 08:07:56 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 992BC7205A for ; Wed, 12 Aug 2015 08:07:54 -0700 (PDT) Received: by pawu10 with SMTP id u10so16445686paw.1 for ; Wed, 12 Aug 2015 08:07:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d/rf3FJrvvQR9CALCdCaIRZZkJfEDR4PyUQY9MFAYw4=; b=oANCbQyspRU7JGgP/BoKBnuJqqORoYgm0LUS35lzCOApD5MrKlywGshe0QG5egBbAp AQ9d6l4Tw1eXbSh+nxJoByMxySpp90wE07kTumMKY/J5zmMbBo1Hkv7qlCpXPZBFifhE 6fUiW5p69sqjiGXi+q1C6bYRGA6ikmMPQ2uN37VTWVGM/wvz6O8i8Dp2N7+CRoOh4rfL trt5A7AMOc2MFur5UPXOploww7Jl1lb6O2bZF6rr+Yt26W0D/QF8PhJ624lPJc7jBy9O J1bA2CKTFT7UowwTMNa+NHy4tBbigx98kZQzcgRjMQQ5olxwceDo1lVfKiyji4Hc25Jc Txwg== X-Received: by 10.66.102.2 with SMTP id fk2mr3729635pab.9.1439392074345; Wed, 12 Aug 2015 08:07:54 -0700 (PDT) Received: from localhost (port-17141.pppoe.wtnet.de. [46.59.128.142]) by smtp.gmail.com with ESMTPSA id k5sm6808376pdn.10.2015.08.12.08.07.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Aug 2015 08:07:53 -0700 (PDT) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [RFC 06/13] drm/dp: Read eDP version from DPCD Date: Wed, 12 Aug 2015 17:06:34 +0200 Message-Id: <1439392001-29637-6-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1439392001-29637-1-git-send-email-thierry.reding@gmail.com> References: <1439392001-29637-1-git-send-email-thierry.reding@gmail.com> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding If the sink support eDP, read the eDP revision from it's DPCD. Signed-off-by: Thierry Reding --- drivers/gpu/drm/drm_dp_helper.c | 30 +++++++++++++++++++++++++++++- include/drm/drm_dp_helper.h | 1 + 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 1fe181525604..c711b690508b 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -295,7 +295,7 @@ EXPORT_SYMBOL(drm_dp_dpcd_read_link_status); */ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link) { - u8 values[7]; + u8 values[16], value; int err; memset(link, 0, sizeof(*link)); @@ -323,6 +323,34 @@ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link) if (values[6] & DP_SET_ANSI_8B10B) link->capabilities |= DP_LINK_CAP_ANSI_8B10B; + if (values[13] & DP_ALTERNATE_SCRAMBLER_RESET_CAP) { + err = drm_dp_dpcd_readb(aux, DP_EDP_DPCD_REV, &value); + if (err < 0) + return err; + + switch (value) { + case DP_EDP_11: + link->edp = 0x11; + break; + + case DP_EDP_12: + link->edp = 0x12; + break; + + case DP_EDP_13: + link->edp = 0x13; + break; + + case DP_EDP_14: + link->edp = 0x14; + break; + + default: + DRM_ERROR("unsupported eDP version: %02x\n", value); + break; + } + } + return 0; } EXPORT_SYMBOL(drm_dp_link_probe); diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 9e70ea8b907d..f9e7f484a225 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -749,6 +749,7 @@ int drm_dp_dpcd_read_link_status(struct drm_dp_aux *aux, struct drm_dp_link { unsigned char revision; + unsigned char edp; unsigned int rate; unsigned int num_lanes; unsigned long capabilities;