From patchwork Fri Jul 16 07:34:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Lin, Wayne" X-Patchwork-Id: 12381565 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 BC880C6377A for ; Fri, 16 Jul 2021 07:36:21 +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 8D217613DF for ; Fri, 16 Jul 2021 07:36:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D217613DF Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine 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 105266E930; Fri, 16 Jul 2021 07:36:21 +0000 (UTC) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2089.outbound.protection.outlook.com [40.107.237.89]) by gabe.freedesktop.org (Postfix) with ESMTPS id AA3866E930 for ; Fri, 16 Jul 2021 07:36:19 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VBaJdm4u5+z7rr+6qK5GoKofRrZ+HovK9HLgjUHsfNpeMxSgNcUthxC34yr2iU1nesC05klPAPjq2IS4tYjL46fdaGzhJ/fWGVT61QL1G3ERF4X1z4GGoruO5Y7uFvlm2lj197XbfqG4sza9WbE3fGqJyJhCwjkXoFJyoENN3TeaS23Nvt7lWe5nRhsvuPMPySHfTxajBezda8Jt4oVqYysrajgOSDN9OHueTP4I0KgRDDbwPeJSugt9tfGv7HEXaErISbhBl8jPTWewRoeogjzyPi1T5zCmFxOMdiwz0QGWL/alvVAoym97TmNe53J6U/UYbGLInuNSBLYUGAy1cg== 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=bJVIrkB/79/ZMZfPQEJ/HRX2YUdRaOJLE0dfmcDfdK4=; b=c/KT/mcAqhaNOyKeN3qA73oewjMLVTDdXSQFy9MFaHNs5OJZs9wTQ0p52Y6Q7W2nEi2ocUclFXq7IdfgcrkshmwGJS6YUuq0mnHLmCHaP7XBgpuFNtnuL6hiJ7ziXaqCt5NzwAhMVxglUMpbC7ZR5kAiJ3m4YrIRVd5KhanNUmhpuHkA1k05D2ZNJ6l217ScW2hPsvDY9bawO3KeDclm2N24fwNF6qtjwc0lvDMplfOprbCjFTmvdTtY+PxZIF0MdD79GMDdJGz0bqMvSyYgoTH/1xRM78dufPp9zEVUFHNoEJlOJ96QaTuQf+6ItC3ViMoyKoHO7S59KyO0UeYKyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linuxfoundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bJVIrkB/79/ZMZfPQEJ/HRX2YUdRaOJLE0dfmcDfdK4=; b=qkUSohEu35PN9aMBnN4gbSqHKJzvtM8oVXCPv9Iqf9MHbvbQEy6AZnHOzo5FjKW6cQzw6O/A+tlz/RD0beWpd4tSTSw64UoaPqSe2nhDjYbisORGZ+3vTxaVQkRQQvFfD/EHLqOPm3Ndf045FBg08K5jyEZCzoDlBN4EEDkPRm8= Received: from BN9PR03CA0846.namprd03.prod.outlook.com (2603:10b6:408:13d::11) by DM6PR12MB4745.namprd12.prod.outlook.com (2603:10b6:5:7b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21; Fri, 16 Jul 2021 07:36:17 +0000 Received: from BN8NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13d:cafe::40) by BN9PR03CA0846.outlook.office365.com (2603:10b6:408:13d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.24 via Frontend Transport; Fri, 16 Jul 2021 07:36:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; linuxfoundation.org; dkim=none (message not signed) header.d=none;linuxfoundation.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT043.mail.protection.outlook.com (10.13.177.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4331.21 via Frontend Transport; Fri, 16 Jul 2021 07:36:17 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Fri, 16 Jul 2021 02:36:17 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.2242.4; Fri, 16 Jul 2021 02:36:16 -0500 Received: from wayne-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2242.4 via Frontend Transport; Fri, 16 Jul 2021 02:36:15 -0500 From: Wayne Lin To: , Subject: [PATCH 3/3] drm/dp_mst: Add missing drm parameters to recently added call to drm_dbg_kms() Date: Fri, 16 Jul 2021 15:34:50 +0800 Message-ID: <20210716073450.26497-4-Wayne.Lin@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210716073450.26497-1-Wayne.Lin@amd.com> References: <20210716073450.26497-1-Wayne.Lin@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 64607744-c9e8-420b-e443-08d9482c65df X-MS-TrafficTypeDiagnostic: DM6PR12MB4745: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:127; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SJi3+rgKJCa3ehQAnYuKk0DgSjB+afDGnkwJxr2R9fFX/lDzvasKNM2Mj86BX7HrNRT00cM7MgwJMqSDXR+z3fUThVaCJPsF7eb3h7u6CqO02pLZd1ZVUaV287xF00D7KOQjd4GjLaSewzHt6NqvNm3TaKuWQglzjtgzAPN3iQ6CNzT66Fz0+6163ROA1QHZSlb8jINo1SFCpz4dRGuDHPLpm5BTmzFRxgl12eephcgxNpGcQ6ppC73tqRYhstND3gRxqBtCaAG7ocpqJ0IV9HjCzJVSo8simuTk2mgOo/mnhu69rmwNhqlv/U7YIPH2t8lyKHFpIQnyUFL8I2mysAcHq1pm7WmSObHcO64DKcbWMpE74RHrSyU8SV0FbDaq6yXb5AE7OLceO/uO9kwVBsMd1K3aRSGdK6pyYfwaxpQCkVKOjej2S8vTOlERIpaRCyyg1moOShGZq7XcgILd/FZJ4cPOMNMKCFnXPMj1CLlgOftZNU3sa+gdnztuKVy7EVBHsPTFsfAXThQj8OxP5vG1QTOPTNLibUrB/WOWDQtNjxplSTzuZrrRRasM0Dg7txx2PPV/0M6GuXGrYAJdmotpjvD5+gz90h+hBXbKc5v8K3vorWISNKJqmK3TTBvE8COSwaum7naSvx/JLI/uRng35/LJfcr6Slz3ibgGzUZf0B3ULIvnYchufH+urNCkQYW85ZNAGSOLooVQHx9g3lzWrR4mSZ6m/DZ7IeIQxog= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(5660300002)(8936002)(82310400003)(8676002)(86362001)(186003)(26005)(2906002)(83380400001)(2616005)(426003)(70206006)(70586007)(7696005)(336012)(4326008)(54906003)(1076003)(356005)(36860700001)(47076005)(81166007)(966005)(6666004)(478600001)(316002)(110136005)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2021 07:36:17.4038 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 64607744-c9e8-420b-e443-08d9482c65df 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4745 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: , Cc: dri-devel@lists.freedesktop.org, =?utf-8?q?Jos=C3=A9_Roberto_de_Souza?= , Wayne Lin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: José Roberto de Souza Commit 3769e4c0af5b ("drm/dp_mst: Avoid to mess up payload table by ports in stale topology") added to calls to drm_dbg_kms() but it missed the first parameter, the drm device breaking the build. Fixes: 3769e4c0af5b ("drm/dp_mst: Avoid to mess up payload table by ports in stale topology") Cc: Wayne Lin Cc: Lyude Paul Cc: dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org Signed-off-by: José Roberto de Souza Reviewed-by: Lyude Paul Signed-off-by: Lyude Paul Link: https://patchwork.freedesktop.org/patch/msgid/20210616194415.36926-1-jose.souza@intel.com --- drivers/gpu/drm/drm_dp_mst_topology.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 01570f2549e1..861f16dfd1a3 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3385,7 +3385,9 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) mutex_unlock(&mgr->lock); if (skip) { - drm_dbg_kms("Virtual channel %d is not in current topology\n", i); + drm_dbg_kms(mgr->dev, + "Virtual channel %d is not in current topology\n", + i); continue; } /* Validated ports don't matter if we're releasing @@ -3400,7 +3402,8 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) payload->start_slot = req_payload.start_slot; continue; } else { - drm_dbg_kms("Fail:set payload to invalid sink"); + drm_dbg_kms(mgr->dev, + "Fail:set payload to invalid sink"); mutex_unlock(&mgr->payload_lock); return -EINVAL; }