From patchwork Tue Nov 3 02:50:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koba Ko X-Patchwork-Id: 1392597 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 4CQDmB1j4jz9sTL; Tue, 3 Nov 2020 13:50:18 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kZmOj-0006gR-Bf; Tue, 03 Nov 2020 02:50:13 +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 1kZmOe-0006fw-8H for kernel-team@lists.ubuntu.com; Tue, 03 Nov 2020 02:50:08 +0000 Received: from mail-pl1-f200.google.com ([209.85.214.200]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kZmOd-00052N-TY for kernel-team@lists.ubuntu.com; Tue, 03 Nov 2020 02:50:08 +0000 Received: by mail-pl1-f200.google.com with SMTP id u14so9826860plq.5 for ; Mon, 02 Nov 2020 18:50:07 -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=rm2sotOAGRILGqPxzV862X34NGjMJSGKPmO/LHAndNQ=; b=t9QLpLoD3EVgR90wQHjLLCB6rwfrMxS8w3PwWJdq42iYy461Euyxt+C+3114mFwGxa uR87yi9N5sp+K9ssLZyRonYMZRjrdehEb2Izm1ktw8qUfxMVDaCCKQhZGoL77stNpV35 bxfsyEw20k6AzZ1b8iAVqLg195wBe6YEN5p0zNfUdtaUoJmBKA3gppygcl6IYSRw+stG 6NTn0S614sbFAJJlVoOG4GTVCBFVVqTMjR87VKBBEIv4qpXQOcuPdDURYcstSUZzmDX4 RnzYzH4bMAWnhRGuruCJYtAqcfNCryXohbp05aboOrkCYPwfk0bbWY2msF8Cfjg3q7N0 Iytg== X-Gm-Message-State: AOAM532HXpX2zzMmIOoJW2DTCKQT/rrl5adTxXM0j80eB94aI6eoTlkx K5W8+/jYJtnzdM/ULcdmvkVGpv7nQ/Z5f7PICUzmqWYI1jjYtmDMJKlITxFG8HRYdePpfBm22Lg 57zPqIz9C3X8OVua12V9TrfOtPsD/+fUFRIT1X2ZaQA== X-Received: by 2002:aa7:97af:0:b029:18a:b53d:97f8 with SMTP id d15-20020aa797af0000b029018ab53d97f8mr12179729pfq.17.1604371806408; Mon, 02 Nov 2020 18:50:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJw+0Bw4jbiEl0HWP9u/s/JFyYVo8xr90AHJlOQ6yKZuHSmz17lfj1QpKNKsfjjg/Pe+SfJ5/Q== X-Received: by 2002:aa7:97af:0:b029:18a:b53d:97f8 with SMTP id d15-20020aa797af0000b029018ab53d97f8mr12179715pfq.17.1604371806134; Mon, 02 Nov 2020 18:50:06 -0800 (PST) Received: from canonical.com (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id h10sm13879005pgj.69.2020.11.02.18.50.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 18:50:05 -0800 (PST) From: Koba Ko To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][F/OEM-5.6] Revert "UBUNTU: SAUCE: drm/dp_mst: Retrieve extended DPCD caps for topology manager" Date: Tue, 3 Nov 2020 10:50:00 +0800 Message-Id: <20201103025000.68006-2-koba.ko@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201103025000.68006-1-koba.ko@canonical.com> References: <20201103025000.68006-1-koba.ko@canonical.com> MIME-Version: 1.0 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1902613 This reverts commit d01f3bb0e480e8dbcf4c6405b737606797dd84dc. Signed-off-by: Koba Ko --- 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 c273bd8d46de..8484b8d1688e 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_read_dpcd_caps(mgr->aux, mgr->dpcd); - if (ret < 0) { - drm_dbg_kms(mgr->dev, "failed to read DPCD, ret %d\n", ret); + 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"); goto out_unlock; }