From patchwork Tue Aug 27 14:13:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Francis, David" X-Patchwork-Id: 11117071 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 D2DCA112C for ; Tue, 27 Aug 2019 14:13:45 +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 BA4AD214DA for ; Tue, 27 Aug 2019 14:13:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA4AD214DA 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 4482C89BA3; Tue, 27 Aug 2019 14:13:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790051.outbound.protection.outlook.com [40.107.79.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3C7AC89B69 for ; Tue, 27 Aug 2019 14:13:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k1q96z/L0Phx6Jh211EF/VWAenc2B1eapvnp5qcfeZo1n6JwjlPzmjbMS4VDQxR03EuCPB3W4yHAVtabfci+CWaNc83nwXoYRTqx/fS+2EMZ9AGM+7HUCFV6IHk2C5jPW2hzKAH2cZOS39WJerKeQaUPqEfDYnwcC9w+Vme/SoMUPAFWopPnOF2XQ234Cgfx94pSNxOQ8Fm1zGbzyiUtvF2XZWGy08Kw8q6Ytl9sIJreibtPTafChC8Th0iTIZSgrDbK2qa2n5T3+r8JMxThpXXuAj001xEAhhP7XKWxP9QTWVI+Wk2CehEX9JA4zo1v2npjFv9cWKsPHSJN6HC9eA== 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=tdEOb4F8pJJqc9hIPEG8CuY8FtGQpO9MDI9LqSEU+Io=; b=ZcrwDmcyOrNHxjEK5YTRkMjSb9hEni93FKOiPRf64Jf2LIGOodKdmzvS3VHEGwHNrCBRrBBpU5G8Npk6OlknwUL62839PXEFc6xqzyCX1RLfJ/floU2PVwcHCFyL/arABpacFgkQnNNJXPjd91P9lnFQU9XbJXQ8s1qQPHh5n6cbeKsZ0hT9ONWcEvVr2hfscy7oJZL5L2Wa7BxX/IhgOp+S3Lk+uZOCliN2bIZY1T+7d2nHJG+IU41DpNaAyn06tXA1Tu3dLpkLqGt3tRfKUJsDy2FDQgAXsJF1JBpYVYMPuMBrFNf0aHbYg5WWWX4GHQHST2KkSnq46GDoVgdTRg== 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 BN6PR1201CA0016.namprd12.prod.outlook.com (2603:10b6:405:4c::26) by BN6PR12MB1265.namprd12.prod.outlook.com (2603:10b6:404:1d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.19; Tue, 27 Aug 2019 14:13:37 +0000 Received: from DM3NAM03FT045.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::205) by BN6PR1201CA0016.outlook.office365.com (2603:10b6:405:4c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.14 via Frontend Transport; Tue, 27 Aug 2019 14:13:37 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by DM3NAM03FT045.mail.protection.outlook.com (10.152.82.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 27 Aug 2019 14:13:37 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 27 Aug 2019 09:13:32 -0500 From: David Francis To: Subject: [PATCH v9 4/6] drm/dp_mst: Fill branch->num_ports Date: Tue, 27 Aug 2019 10:13:27 -0400 Message-ID: <20190827141329.30767-5-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190827141329.30767-1-David.Francis@amd.com> References: <20190827141329.30767-1-David.Francis@amd.com> 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)(39860400002)(396003)(346002)(376002)(136003)(2980300002)(428003)(189003)(199004)(1076003)(305945005)(86362001)(186003)(70586007)(476003)(51416003)(26005)(478600001)(76176011)(8936002)(2906002)(70206006)(356004)(6666004)(486006)(4326008)(6916009)(336012)(316002)(50466002)(16586007)(81166006)(81156014)(50226002)(126002)(446003)(47776003)(2351001)(49486002)(11346002)(36756003)(48376002)(426003)(5660300002)(53936002)(8676002)(14444005)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1265; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cfb770fd-86b4-4c92-534e-08d72af8c0f6 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328); SRVR:BN6PR12MB1265; X-MS-TrafficTypeDiagnostic: BN6PR12MB1265: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-Forefront-PRVS: 0142F22657 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: J98CGxe8oTQ6UXRUn/2+oCRJu34z77qu/sTjzKTKY+z7oaGz177mcmy8a1o8kruRCuNFsRVJQvocyLbJzHM6EVE6Djg9gDCZS/aSaCTrgaYO7/EgQ7lE0gTzfAERs9BZB2DpU3xemiXmThAL0DaXjv9RARvPQdyhtsq4y9F38NZQcVjKTxE7K5hwtMR1E5rlI1eeRjkrXFpLfpv/w6CWvJ8RgkvmUIHNMmAnzxW/KNpWUM2KHVHH6HzYYNLUSeM22fpHjQbU07B5E1xmES36oP8eTcykmgvCtOE6dJ95AjuIn+zpyzLM6SRpM4amrwp1C16Eq0IVRN8kvlClx1eyzv9hkH3ygZFfSHY7XnD7hsPWjLxCtxX39D8GrY3ZxQWyt6Q2T2xHBRnxE6R3Jbs3aXUIjOEJDwcGLoekRSj7nP8= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2019 14:13:37.2628 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfb770fd-86b4-4c92-534e-08d72af8c0f6 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=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1265 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=tdEOb4F8pJJqc9hIPEG8CuY8FtGQpO9MDI9LqSEU+Io=; b=a2HKIfMaRDcQBEs0wNjMFAiHwDRsKvIpcUSPVmPm3T8SHVmszQavnvbVx3ztBB/sOTC3tsc/Q7IHxbpGPEWII5d/73lDdEtRM1fMu544VfWpXMcRGOYz+fgHoAvqbsVJuMqn0cA9ga5SseYYusEzpQeYvdK3wHFc7bWLJlfFqG0= 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: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This field on drm_dp_mst_branch was never filled It is initialized to zero when the port is kzallocced. When a port is added to the list, increment num_ports, and when a port is removed from the list, decrement num_ports. v2: remember to decrement on port removal v3: don't explicitly init to 0 Signed-off-by: David Francis Reviewed-by: Lyude Paul Reviewed-by: Harry Wentland --- drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 9f3604355705..502923c24450 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1669,6 +1669,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, mutex_lock(&mstb->mgr->lock); drm_dp_mst_topology_get_port(port); list_add(&port->next, &mstb->ports); + mstb->num_ports++; mutex_unlock(&mstb->mgr->lock); } @@ -1703,6 +1704,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, /* remove it from the port list */ mutex_lock(&mstb->mgr->lock); list_del(&port->next); + mstb->num_ports--; mutex_unlock(&mstb->mgr->lock); /* drop port list reference */ drm_dp_mst_topology_put_port(port);