From patchwork Wed Sep 16 06:51:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1364996 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BrrNq1WSGz9sTv; Wed, 16 Sep 2020 16:51:38 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kIRHz-0002X1-Oy; Wed, 16 Sep 2020 06:51:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kIRHx-0002VL-Hf for kernel-team@lists.ubuntu.com; Wed, 16 Sep 2020 06:51:33 +0000 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 1kIRHx-0006MR-6K for kernel-team@lists.ubuntu.com; Wed, 16 Sep 2020 06:51:33 +0000 Received: by mail-pf1-f199.google.com with SMTP id y76so3376293pfb.10 for ; Tue, 15 Sep 2020 23:51:33 -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:subject:date:message-id:in-reply-to :references; bh=OKxIJsRcLKHTvcLZ7NcItvNmL7s+wZALmqsFWEJ+vMw=; b=LVMOqgnwWKm13wmKgkR0NgXJ4gQVj7TYtmmS1E8A1MKAO9S9K9e+UNzHUw03oHfAfg aGFWUo6hMLlQFl//JqCYU2wI1ft3pOhvqQqZGyJhafH27KCPfZ4mSCTfKBbYEBExy2mM A3vp7UoGI72JTkPyvA0SOuZFQVfz8wXA43e4Q6Aghdnd4IENBsMdFeP2cVgiVvA+jW9v iAu4NI1aYm6UmUEihpUMNsEY8GJyl6PfbFDpvWrJ1IRMQQ4FZsc0UaqCzE6fobcN2pcx gPwC9oaWsxe1upi5cUpyVW8QLzlD7PMjap1jt8EQhLRBptw3fmaqHK6ZqMU85qRrjk4q pjlg== X-Gm-Message-State: AOAM533SG00cevytTwoCf/2oACah6GlkP0Wekdu3eyLF3Wqzw2LDLWs1 tMmqCzMqazbT/jtKWl/Hf7BJeUeqLFqp/Gav1AG3ZvGagCEPmnPIJul4PqyI7GMmoGhIcrFC2s0 RES1XN6AdwcYfaoohSLeq/FfM3tX8iOiz8RGj6Hy44A== X-Received: by 2002:a63:521c:: with SMTP id g28mr10506640pgb.43.1600239091740; Tue, 15 Sep 2020 23:51:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSZjXBabtwsj+tTEK2ev8KVeacGAGkNiP+9Z7lStRVUQPQGF9fsn0aEuO2/WgdXcrHbaSt/A== X-Received: by 2002:a63:521c:: with SMTP id g28mr10506621pgb.43.1600239091423; Tue, 15 Sep 2020 23:51:31 -0700 (PDT) Received: from canonical.com (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id bx22sm1525028pjb.23.2020.09.15.23.51.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Sep 2020 23:51:31 -0700 (PDT) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3][SRU][OEM-5.6] UBUNTU: SAUCE: drm/dp_mst: Retrieve extended DPCD caps for topology manager Date: Wed, 16 Sep 2020 14:51:22 +0800 Message-Id: <20200916065122.1776-4-koba.ko@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200916065122.1776-1-koba.ko@canonical.com> References: <20200916065122.1776-1-koba.ko@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1893752 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 --- drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 8484b8d1688e..c273bd8d46de 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3517,9 +3517,9 @@ 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, "failed to read DPCD, ret %d\n", ret); goto out_unlock; }