From patchwork Mon Dec 2 03:57:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lin, Wayne" X-Patchwork-Id: 11268683 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F5AB6C1 for ; Mon, 2 Dec 2019 03:58:36 +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 6DBE220748 for ; Mon, 2 Dec 2019 03:58:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DBE220748 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.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 233EE89C17; Mon, 2 Dec 2019 03:58:34 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680075.outbound.protection.outlook.com [40.107.68.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 937F289C17; Mon, 2 Dec 2019 03:58:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EDwLCRZaP6MBz5wJEE1FJpxeKUGmSCpixgzwN7W6WwFnm0FIePLQIk3XMCCDWt6e2VdK+Q3yxTpeEf+A7QBWmgApHglxDx3osNhXYMk1KZdA5V/ykMy0KOjH0GAXlT+sXWc6auW6YUxAQ0epSbpQNHxAS1T5J0AEtEan9ZtZsWyOYLrQcgyeDAnZPTvRCYz8u8Eri9bMP3SDDz+KbJQyOPGhX68njEwfmHTnZDAe0IOaLMl0ymTN5qNph/aD0VhIJWQo8GGrWSpBiU5sQ5Zi3XvwAz0ESsZOyEN88d6d7gjQ2oFfeu0Ae84dwuuHfN7yra9ZpBHM23v8CELRHkX9JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TFesstjvR9aPczUE8dLuv6bK+uduYwvkBBw3kKCSV48=; b=HklM040q2rezzcv/+DaR8Bci4Gpe2jYC1TOh7la4uxh/jADIO+jjEEbehMmmyA5EEe/QDPj/IEE5JtzOKsrMpCAQRXBDCV7n1VnpDc3pppI30UD0gTO+HlyZKlOSfXpqlFacKt8loHbkyEXW1J2DizavoNoe4BlXp2KBxE85NVamd4gU9q9GVhFBkdlLPmge4qABcITAYBPFyYRvda8Qy0hm8FJlLtTVVrYYJEnIDKah5v6FDVbNXZCDCiTSRl/qzq3P2wVAMju227jT2f0TwznuWEdEZLP7/Vto2WmBZddflOJTHLgZx3BTM0n+UI5RgveIuK+8mqxRrxs3r2VXiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR12CA0042.namprd12.prod.outlook.com (2603:10b6:301:2::28) by BN8PR12MB3617.namprd12.prod.outlook.com (2603:10b6:408:47::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2495.19; Mon, 2 Dec 2019 03:58:30 +0000 Received: from BN8NAM11FT010.eop-nam11.prod.protection.outlook.com (2a01:111:f400:7eae::200) by MWHPR12CA0042.outlook.office365.com (2603:10b6:301:2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2495.17 via Frontend Transport; Mon, 2 Dec 2019 03:58:29 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXMB02.amd.com (165.204.84.17) by BN8NAM11FT010.mail.protection.outlook.com (10.13.177.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2451.23 via Frontend Transport; Mon, 2 Dec 2019 03:58:29 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB02.amd.com (10.181.40.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 1 Dec 2019 21:58:29 -0600 Received: from SATLEXMB02.amd.com (10.181.40.143) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 1 Dec 2019 21:58:28 -0600 Received: from wayne-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB02.amd.com (10.181.40.143) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Sun, 1 Dec 2019 21:58:26 -0600 From: Wayne Lin To: , Subject: [PATCH] drm/dp_mst: Remove VCPI while disabling topology mgr Date: Mon, 2 Dec 2019 11:57:37 +0800 Message-ID: <20191202035737.16909-1-Wayne.Lin@amd.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(39860400002)(136003)(396003)(428003)(189003)(199004)(6666004)(50226002)(53416004)(36756003)(14444005)(48376002)(336012)(305945005)(186003)(5660300002)(81156014)(81166006)(478600001)(54906003)(316002)(16586007)(8676002)(356004)(26005)(50466002)(47776003)(1076003)(8936002)(86362001)(2906002)(4326008)(426003)(51416003)(7696005)(2616005)(70586007)(110136005)(70206006); DIR:OUT; SFP:1101; SCL:1; SRVR:BN8PR12MB3617; H:SATLEXMB02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 285d5e0e-17b4-4806-6185-08d776dbe444 X-MS-TrafficTypeDiagnostic: BN8PR12MB3617: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-Forefront-PRVS: 0239D46DB6 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uqkhVn/UslgCHOPMspZLx+VZx6ys6a2c9L35z0YI//LuPO3bidSaKa+5lIjLYytLRrUfAHNtOYarEUa7WrNMqY38OogwlCKQOMMuB0zS3VGDEoq/lwnLsJ84gjwjNcPORGSkehnbO+aufmh1KoQXOOWS7f2TwWIiLpS8talp14HH5ZubgOp5IOqUsZXdbezRvhBdIiyrAxmOiKU4dnV3rSovRvZkw2laAsWM/J/l7JJaJxqBLnZzI8m5ZKjv0tuIsMqxX/oN0VQpk82138ypqX6NpIOERD/vLlazahSvmaNTnlJSRvU/Vhq3rVD/Tgz05Easz2VQ6xfaHmnD/ZqkABjC2peF3Icr1tqX21L30nOE1ZxbyEmUgajE2PxXlPL5lmWwWFENWi6bffcztypcgJTKj+x7Kru10KXRmf78TOl2bPwxy3nWDQcPgxNh2Eer X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2019 03:58:29.5400 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 285d5e0e-17b4-4806-6185-08d776dbe444 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3617 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TFesstjvR9aPczUE8dLuv6bK+uduYwvkBBw3kKCSV48=; b=RYfq3sjzZ+Z6qsOmCasvFUv55zdw5VuiXlj7+0e1C+zilD6RVwd832pkq/icicCSsuVcWndVal3o+VL3qZXDgsEFKfGO/VFfj9RAhf8/JtZu5RtvD0iu/supCfWXVFF1abfvXGvu/8iQ/9fresfAH8Yepoc7gFaSMv4mHwInAFM= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.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: , Cc: Jerry.Zuo@amd.com, Nicholas.Kazlauskas@amd.com, Wayne Lin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" [Why] While disabling mst topology manager in drm_dp_mst_topology_mgr_set_mst(), now just reset the mgr->payloads but doesn't handle the mgr->proposed_vcpis. [How] Remove mgr->proposed_vcpis to NULL. Signed-off-by: Wayne Lin --- drivers/gpu/drm/drm_dp_mst_topology.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index ae5809a1f19a..81e92b260d7a 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3386,6 +3386,7 @@ static int drm_dp_get_vc_payload_bw(u8 dp_link_bw, u8 dp_link_count) int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool mst_state) { int ret = 0; + int i = 0; struct drm_dp_mst_branch *mstb = NULL; mutex_lock(&mgr->lock); @@ -3446,10 +3447,21 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms /* this can fail if the device is gone */ drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL, 0); ret = 0; + mutex_lock(&mgr->payload_lock); memset(mgr->payloads, 0, mgr->max_payloads * sizeof(struct drm_dp_payload)); mgr->payload_mask = 0; set_bit(0, &mgr->payload_mask); + for (i = 0; i < mgr->max_payloads; i++) { + struct drm_dp_vcpi *tmp_vcpi = mgr->proposed_vcpis[i]; + + if (tmp_vcpi) { + tmp_vcpi->vcpi = 0; + tmp_vcpi->num_slots = 0; + } + mgr->proposed_vcpis[i] = NULL; + } mgr->vcpi_mask = 0; + mutex_unlock(&mgr->payload_lock); } out_unlock: