From patchwork Wed Jan 13 01:41:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 12016085 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F419C433E6 for ; Wed, 13 Jan 2021 08:22:18 +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 4203E2333B for ; Wed, 13 Jan 2021 08:22:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4203E2333B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.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 5F4706E12E; Wed, 13 Jan 2021 08:21:33 +0000 (UTC) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48A7C89A86 for ; Wed, 13 Jan 2021 01:42:03 +0000 (UTC) Received: from mail-pl1-f198.google.com ([209.85.214.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kzV9q-0002fH-9q for dri-devel@lists.freedesktop.org; Wed, 13 Jan 2021 01:41:10 +0000 Received: by mail-pl1-f198.google.com with SMTP id b2so213666pls.18 for ; Tue, 12 Jan 2021 17:41:10 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=VzdOF8J+GZRgyyD73mbL6B1kdprEKDDRyev/uww/1pM=; b=rIxcTMvdvXT7tBrRRJy+8mi8VV9gu7FGmwxk5bacyZAKqRQODAfU7jedK6iHnAx1OP 0f68GkkSNOWNnshk5g6tdJ3yS2x2DWKzm3c6Ey216eT244RqE4LMQhcPa815OEsu3/j5 nA29Oij65qrZbVbZbzkm81EOcLYLOhGZPwWH6ydvshHvb+cqkiluSsfWYVn5e6+/f2x5 O3BdAUQrj1CKUmxu36n5JH/Ny7prHs+m+0W3Ul3o4Ba6H33hAlD0vXUbEOyNUBINRYL8 qtG1E6Sh/IaGsSDNMGacMlbN6y6UxTgq33ZzTPz7dnVE6/C8QSMvko1IvHhCYMcIVSV6 nq7A== X-Gm-Message-State: AOAM531OsXC7S8tPDaG0JsTxRL++2rfuDY7zyyVSTAI5WHFEU8P8f8Tk JnekonX2wIpAS0nkR+gaSDyuryx91YxyofJvEa1DTrTucOf3BfNY7bw1xPjYFbqN96BqNcfRi78 pP84+owF0grCEsFyCibHUPmxBvHKyZsZWHqUcJLar2DxMTw== X-Received: by 2002:aa7:9782:0:b029:19e:b084:f0a9 with SMTP id o2-20020aa797820000b029019eb084f0a9mr18583pfp.28.1610502068905; Tue, 12 Jan 2021 17:41:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7piFkV3OCXWidUjdkxc1oP640g6yICBb7f9TEClAaEm7gncz9ccnwqqyMKqt/HWSmzMJvWw== X-Received: by 2002:aa7:9782:0:b029:19e:b084:f0a9 with SMTP id o2-20020aa797820000b029019eb084f0a9mr18549pfp.28.1610502068269; Tue, 12 Jan 2021 17:41:08 -0800 (PST) Received: from canonical.com (36-229-237-19.dynamic-ip.hinet.net. [36.229.237.19]) by smtp.gmail.com with ESMTPSA id l7sm323837pjy.29.2021.01.12.17.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 17:41:07 -0800 (PST) From: Koba Ko To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Lyude Paul , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] drm/dp_mst: Retrieve extended DPCD caps for topology manager Date: Wed, 13 Jan 2021 09:41:04 +0800 Message-Id: <20210113014105.28110-1-koba.ko@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 13 Jan 2021 08:21:20 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" As per DP-1.3, First check DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT. If DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT is 1,read the DP_DP13_DPCD_REV to get the faster capability. If DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT is 0,read DP_DPCD_REV. Signed-off-by: Koba Ko Reviewed-by: Lyude Paul [added aux name to drm_dbg_kms() call] Signed-off-by: Lyude Paul Link: https://patchwork.freedesktop.org/patch/msgid/20200922065313.4794-1-koba.ko@canonical.com --- drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 0401b2f47500..6982ecbf30b5 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3686,9 +3686,10 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms WARN_ON(mgr->mst_primary); /* get dpcd info */ - ret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, mgr->dpcd, DP_RECEIVER_CAP_SIZE); - if (ret != DP_RECEIVER_CAP_SIZE) { - DRM_DEBUG_KMS("failed to read DPCD\n"); + ret = drm_dp_read_dpcd_caps(mgr->aux, mgr->dpcd); + if (ret < 0) { + drm_dbg_kms(mgr->dev, "%s: failed to read DPCD, ret %d\n", + mgr->aux->name, ret); goto out_unlock; } From patchwork Wed Jan 13 01:41:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 12016059 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E29BC433DB for ; Wed, 13 Jan 2021 08:21:39 +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 E2E87208D5 for ; Wed, 13 Jan 2021 08:21:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2E87208D5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.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 7D3236E09A; Wed, 13 Jan 2021 08:21:21 +0000 (UTC) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0692A89786 for ; Wed, 13 Jan 2021 02:00:07 +0000 (UTC) Received: from mail-pf1-f199.google.com ([209.85.210.199]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kzV9t-0002fy-6a for dri-devel@lists.freedesktop.org; Wed, 13 Jan 2021 01:41:13 +0000 Received: by mail-pf1-f199.google.com with SMTP id c70so328525pfb.16 for ; Tue, 12 Jan 2021 17:41:13 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=M0qke6RiDqH8X2MkuYVX3XxIIT1dCpS1MvePoGipk34=; b=os2/0+8Ifdbd4EivWA3buOGacuv0O49SdYY6zNT8UaFQ3BjWqDiIFjk53vOubCbo/5 4jEvUluwnmrwaksDQrpcprYAxSEVukzpNddhdmRDbXnvWsTVX8FzkDUfo1yE+FFM3N2S CKF1LE91aEvyG3/4teWHcA4ss1YKLnxtzGJPLbcNxf0tDjb6NXm3tEup11ZFXHda1AUY hQ5aIGwCNLgFZDc1zRPQZCvXwKNktRxt0huOGakQAuqo6HxbQardm38t3T7agA5V5a5l IO69fdPqA3mm+rjJeKCJJ6fYODvVEKFQ5RReRNSLI9ojFFU3RpxK1+mR+Bu1Qr/9rf0c CROw== X-Gm-Message-State: AOAM5327i+RIJWI1NjA2HjmzInqlzqkl5sVtH741KjKvhe/372k+MnZ4 9lV9b8QpIL5h47kvSIVA5qmu6DEYjOKMgpx/JpvE7r7BbhUFhxULeQ9SL8OACaDUt4gBrhzFsgI L0ehaxyIRKHM9NF0tl6NOacNBy8ciRwqJr500Nt1C69yksQ== X-Received: by 2002:a63:f512:: with SMTP id w18mr1958236pgh.154.1610502071778; Tue, 12 Jan 2021 17:41:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwOeRDHDSY/QLh1+XtdjXRCHURPz0Q/OPScWD7mclZCGN6n6gxmvgz9mSVJ1i09OajxeS9LHw== X-Received: by 2002:a63:f512:: with SMTP id w18mr1958217pgh.154.1610502071526; Tue, 12 Jan 2021 17:41:11 -0800 (PST) Received: from canonical.com (36-229-237-19.dynamic-ip.hinet.net. [36.229.237.19]) by smtp.gmail.com with ESMTPSA id x27sm394824pfr.122.2021.01.12.17.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 17:41:11 -0800 (PST) From: Koba Ko To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Lyude Paul , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] drm/dp_mst: Align mst link rate with soure rate Date: Wed, 13 Jan 2021 09:41:05 +0800 Message-Id: <20210113014105.28110-2-koba.ko@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210113014105.28110-1-koba.ko@canonical.com> References: <20210113014105.28110-1-koba.ko@canonical.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 13 Jan 2021 08:21:20 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" After read the link rate from MST hub, align with maximum source rate. Signed-off-by: Koba Ko --- drivers/gpu/drm/drm_dp_mst_topology.c | 8 ++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 7 +++++++ include/drm/drm_dp_helper.h | 8 ++++++++ include/drm/drm_dp_mst_helper.h | 4 ++++ 4 files changed, 27 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 6982ecbf30b5..e7ceae97be85 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3672,6 +3672,10 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms { int ret = 0; struct drm_dp_mst_branch *mstb = NULL; + unsigned int max_link_rate_tbl[MAX_DRM_DP_MAX_RATE + 1] = { + DP_LINK_BW_1_62, DP_LINK_BW_2_7, DP_LINK_BW_5_4, + DP_LINK_BW_8_1, DP_LINK_RATE_TABLE + }; mutex_lock(&mgr->payload_lock); mutex_lock(&mgr->lock); @@ -3693,6 +3697,9 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms goto out_unlock; } + if (mgr->max_source_rate < MAX_DRM_DP_MAX_RATE) + mgr->dpcd[1] = max_link_rate_tbl[mgr->max_source_rate]; + mgr->pbn_div = drm_dp_get_vc_payload_bw(mgr->dpcd[1], mgr->dpcd[2] & DP_MAX_LANE_COUNT_MASK); if (mgr->pbn_div == 0) { @@ -5422,6 +5429,7 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, mgr->aux = aux; mgr->max_dpcd_transaction_bytes = max_dpcd_transaction_bytes; mgr->max_payloads = max_payloads; + mgr->max_source_rate = MAX_DRM_DP_MAX_RATE; mgr->conn_base_id = conn_base_id; if (max_payloads + 1 > sizeof(mgr->payload_mask) * 8 || max_payloads + 1 > sizeof(mgr->vcpi_mask) * 8) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 469e765a1b7b..a89b4c823123 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -5392,6 +5392,13 @@ intel_dp_configure_mst(struct intel_dp *intel_dp) intel_dp->is_mst = sink_can_mst && i915->params.enable_dp_mst; + if (intel_dp_source_supports_hbr3(intel_dp)) + intel_dp->mst_mgr.max_source_rate = DRM_DP_MAX_RATE_HBR3; + else if (intel_dp_source_supports_hbr2(intel_dp)) + intel_dp->mst_mgr.max_source_rate = DRM_DP_MAX_RATE_HBR2; + else + intel_dp->mst_mgr.max_source_rate = DRM_DP_MAX_RATE_HBR; + drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst); } diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 6236f212da61..ef2b328469cd 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -183,6 +183,14 @@ struct drm_device; #define DP_SUPPORTED_LINK_RATES 0x010 /* eDP 1.4 */ # define DP_MAX_SUPPORTED_RATES 8 /* 16-bit little-endian */ +enum drm_dp_max_link_rate { + DRM_DP_MAX_RATE_RBR = 0, + DRM_DP_MAX_RATE_HBR, + DRM_DP_MAX_RATE_HBR2, + DRM_DP_MAX_RATE_HBR3, + MAX_DRM_DP_MAX_RATE +}; + /* Multiple stream transport */ #define DP_FAUX_CAP 0x020 /* 1.2 */ # define DP_FAUX_CAP_1 (1 << 0) diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index f5e92fe9151c..e7d8c899fea0 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -593,6 +593,10 @@ struct drm_dp_mst_topology_mgr { * @max_payloads: maximum number of payloads the GPU can generate. */ int max_payloads; + /** + * @max_source_rate: maximum link rate of source. + */ + int max_source_rate; /** * @conn_base_id: DRM connector ID this mgr is connected to. Only used * to build the MST connector path value.