From patchwork Mon Dec 7 18:55:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Wentland X-Patchwork-Id: 7789271 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5CF5E9F1C2 for ; Mon, 7 Dec 2015 19:11:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E1092055D for ; Mon, 7 Dec 2015 19:11:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DF026203B7 for ; Mon, 7 Dec 2015 19:11:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC6FD6E6EB; Mon, 7 Dec 2015 11:11:27 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 924 seconds by postgrey-1.34 at gabe; Mon, 07 Dec 2015 11:11:25 PST Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0096.outbound.protection.outlook.com [157.56.110.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id E4A956E6EB for ; Mon, 7 Dec 2015 11:11:25 -0800 (PST) Received: from BY2PR12CA0008.namprd12.prod.outlook.com (10.160.121.18) by BY2PR12MB0712.namprd12.prod.outlook.com (10.163.113.22) with Microsoft SMTP Server (TLS) id 15.1.337.19; Mon, 7 Dec 2015 18:56:12 +0000 Received: from BY2NAM03FT020.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::209) by BY2PR12CA0008.outlook.office365.com (2a01:111:e400:2c84::18) with Microsoft SMTP Server (TLS) id 15.1.337.19 via Frontend Transport; Mon, 7 Dec 2015 18:56:13 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.222) 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from atltwp02.amd.com (165.204.84.222) by BY2NAM03FT020.mail.protection.outlook.com (10.152.84.224) with Microsoft SMTP Server id 15.1.346.13 via Frontend Transport; Mon, 7 Dec 2015 18:56:12 +0000 X-WSS-ID: 0NZ04LK-08-564-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by atltwp02.amd.com (Axway MailGate 5.3.1) with ESMTPS id 2EA58D22163 for ; Mon, 7 Dec 2015 13:56:08 -0500 (EST) Received: from SATLEXDAG02.amd.com (10.181.40.5) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 7 Dec 2015 12:56:31 -0600 Received: from STOREXDAG02.amd.com (10.1.13.11) by SATLEXDAG02.amd.com (10.181.40.5) with Microsoft SMTP Server (TLS) id 14.3.266.1; Mon, 7 Dec 2015 13:56:11 -0500 Received: from cnhwentlanub.amd.com (172.29.225.36) by storexdag02.amd.com (10.1.13.11) with Microsoft SMTP Server id 14.3.266.1; Mon, 7 Dec 2015 13:56:10 -0500 From: Harry Wentland To: Subject: [PATCH 2/2] drm/dp/mst: save vcpi with payloads Date: Mon, 7 Dec 2015 13:55:52 -0500 Message-ID: <1449514552-10236-3-git-send-email-harry.wentland@amd.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1449514552-10236-1-git-send-email-harry.wentland@amd.com> References: <1449514552-10236-1-git-send-email-harry.wentland@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(48376002)(77096005)(76176999)(53416004)(2351001)(450100001)(86362001)(575784001)(2950100001)(50986999)(229853001)(36756003)(110136002)(92566002)(87936001)(33646002)(97736004)(5003940100001)(47776003)(101416001)(50466002)(105586002)(106466001)(19580405001)(19580395003)(189998001)(50226001)(1096002)(1220700001)(5003600100002)(586003)(5008740100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR12MB0712; H:atltwp02.amd.com; FPR:; SPF:None; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0712; 2:o7oVGBzmzg6MpPbNLqHenqS7+kzy0ZVcoPQYF+0zkS/2f+I2U+JVANG+1ZJ2eTzJh5CHkF8MgHYGKZYSiLAPw2UH9VeF6jPeoizTn58V5BG2koKD6h68WP1WuBiEUrKMX5Ztd1r0+Z03ENJWkyLXhw==; 3:GHF2PTRf2gIaQGirOfUZD2B1dOlETA2QxfXHxSVpHUKHJNk0v0vI8pxzJcmbTD/oVNAO8StWntIyqxUhpaeWTrFPQeHojIMT2ESYpTDbJIivMnJl/0+SYlo3ppUvGvFF5l7T/mtrP6kF67X1nhQ5f6cUZLhOXBRJ5Oi3fy8htdfvtMjflml/qxAxopFzXQ5nDIgBsVODUfXK5be0ue5/2UxQNCW5g7+3rl8SBKxfAJs=; 25:1UtYfZ1MePxmMWF++Z21FEq2gDKlrx+CLjJyl2H4iybT/rzm7gwS7/4BVhmYtcu3MJh24UtuqCWdSiXkyOFttwVUJ8u4NPV+KyNkIo5WsZLNngVVLqwmxo6VL3vjheY1IT88rqoWa9X9AmRZzVneNQJFh7M84ex8zUKKaJZZEgY906SJtRr+//ceSNsmNMrjGQSckPjpaMLzvZ6pAEiEcexalrjnywlNbhUZs+8OqBaLEriLSm2WVSzEEKWObGVJ X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0712; X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0712; 20:WQtCubbvSGUt9GllX/9TnE0hpBeuvpoTUXUmnFs2lvOpsD9cSGMTxCETJyhJSpQAqZFRSt+xp4mTCKWeD2KdRnYVEkzRKjbEjCYxzeKelbvAwE/j7c6mHln4Mn1AjZqB8bMlOlyFWSKfab83Tv0UoS00QiDlW559i7JOSmVovYJBLO4fAZMkjQZnu5vkoPjk2+qA2Tya4bzBSDv029R02LjfKAK3bN+ZXdOe+XEKiLOf3DEJzQxaJkjckuK3SZkyxrFQ7kiMT6NiVML2FdmUNu5vBGw1ZtWSLoM2vr8qcpRWIo2FWHkMMYjPJ+IVxp0TvFH94nod8nRQrmDB+byRo0mUvEnhoi5VgQk4c4qyzPCuif9OHb1Vb0Jyu5y/+N3S8xoOVRzC+ibneTRRfkI/75qpKVaR3ZrSVp3fGmHra9/1VNDxZHbMSdSOQCGOhSBsUUYKV0/IfkgWiy9qbDjeBFehWwXkrLqTK+gZ/fSDMxuQswNr2APrQbnMZVWxfRhG; 4:lCRDXBjvFll3M+acEI8+xZsZ8twZDe4QCGZpAMryTpiwS7V3AMYJtwH6i8T0n8qCug7308wwP/z/abWdQOtyc6sQRD+JH0rYTmZQEF6ONlXqcLqVUr0+V49SirfhGl5RWhOThs3t7TWAUppWDxquj1N4A0SpTBIoEJaHyF44G2Fy7mq/cl459cshJtC8/vqAZOJXQocuypftkuVlSe7NRwZ7Y8xNyPlLu6neG+LdKNqDuiITw+LCXvnODI0zqA0Ld00E8Q4pTo32eOkS/9BbWPLz32S4MqQkjKWgxBm0tpawSDl/6p6ylGiCNMJaxux9uZ8jW6f/D/bY02wAqihqGcmRtb+x/zNhgueAVknQHJKtR7/B2vjZ7z40bHGYQEC+POxfdxQfuMSVIfWVN3hSLqywwOoBrvk/P9tqFHC9TkE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(10201501046); SRVR:BY2PR12MB0712; BCL:0; PCL:0; RULEID:; SRVR:BY2PR12MB0712; X-Forefront-PRVS: 078310077C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR12MB0712; 23:O18H9p8e+jA99VnEzGQUDHm86FANoUtCCfl8DfLM2?= =?us-ascii?Q?9Q6imgSl1qIUEPMZoCEqie9SwxlYOzTSLifhK4EnmPqSCwJwml9zITJKliZT?= =?us-ascii?Q?x4WTJrsWOUA/i2utkHTqPzYPDjUUGPop/68Yz9B3sdSPSkpKeQFWVScN99HZ?= =?us-ascii?Q?Omx7tGlH9G4zKCeB6fbqOdBS7wsm2f/koZLiSJNo0j5hcZzpnCFvkh+FpYLw?= =?us-ascii?Q?/byQxob9JnWkiwlvsu+v1N5LlumoBKJqSYV0YJGZ7BaF51htvmqtQFhZxi23?= =?us-ascii?Q?OaZ7NsFcJB9NC+ccIVchq1yEoK8re2EvNXJuwN0s8qO58+T0PLycXhsRM7Yt?= =?us-ascii?Q?UuSUrgelHdPl4nktHKEh/4axl/p9jIlGssv/TFc/us5cpd19HP/pQIPlHBh1?= =?us-ascii?Q?Bzo64dxiCnWl1wEmM5wsm48WG6BHQWY3JoDvZoCFlVpMTCsIO0smcc5Vqzpc?= =?us-ascii?Q?dyicWqRQWBBiu7MfiKwem8bYDoLpNL4Ob6pfcfOAPw+o+h0VF8z3/9Wrh93d?= =?us-ascii?Q?FUiANG6JRNYs8GLHI7quQVCAe+/O04TeTBgZazU3O1HW8HL8fAWJx8wTN09+?= =?us-ascii?Q?uLUnbAvzWnNcLoi/kyqS48Q70TikVeetdxpOIragLj1yBncCkr6HEVWZtlgh?= =?us-ascii?Q?QFpjY3WJbb4eaQ0vNb9XQ51nqq7/wV24IDMwVdbegt6WE9RuMPKuvpg2eJVa?= =?us-ascii?Q?ErzxuUE7IdQhgVuQxpjrXQBdunsbX1qxO7DBizU7RIgIpG+qaf93YtOik4Ts?= =?us-ascii?Q?xbHRivJ/Eh5fhZ+dIcz3fHWD6ggbuNdR83b3rbj7My+inWaA0s1rChyEjmgi?= =?us-ascii?Q?3Hk1QMpIHsQ75K7exbkL1jWnYHVa2ZfR8Vwr0jjwJdAx1fW5+OoSbvP9zTAL?= =?us-ascii?Q?cmerkj4GciFsZ9yZip3hgW/BW5dAp/vJPweoLBGWiqfSeKpN9C2MgPYnoLBk?= =?us-ascii?Q?UtrxmGS0DkAUAU83Wk2fwiVJYCeLqLaJxyt1GqJ2Xni2/TgYeqYZbnQBmhC/?= =?us-ascii?Q?uo=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR12MB0712; 5:MGq2403wXpOS4hCqRsJofuIWqtKV+rFdUb0FrogW+U+Q1qmmhguAGQvO+kJlCkdn7/APg/ftZ7JUMxz/87PvdHrfuHQeVsd6iEXoywir6ZKNqXYEz29fJeYRG4rUP+GerRBhfWOYQrdH9Ot7CBDSbw==; 24:28VqQddd+76UPC2JHMr+aLZL565Jmi4dBGAHaostAAvH4ynLBHo6yosSuZPi8ZLollgiAVDUKuOp1oksuxEC8jt8LSBccrEekcD0MBS0ynM=; 20:oAhdJRTcFTiJR2XZDf8vzDDdxsywQo838eOhr+sVWOhdfnAuFjDFM//AFhj06YxJ48tNfMIJ4FuwgnqFz+iCwi/NHCKKsAXcMe/n94xNTYvT3n2wdT3K97GzLNB6TpJQZzSTrLviyLX2G/Oa7tSNTRsf7AQKKMp0hNphepC+ftwgd/tJ5pN3PZQzM5HVH1Ax+nfHBf8gaXbifCsIeWt/mXBxxr3hqQtLr5k9hnOFvdvbCkn0+C1IG4wLTJ01i56R SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2015 18:56:12.4619 (UTC) 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.222]; Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0712 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This makes it possibly for drivers to find the associated mst_port by looking at the payload allocation table. Signed-off-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 64a0a3729643..3b6627dde9ff 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1673,6 +1673,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) if (mgr->proposed_vcpis[i]) { port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi); req_payload.num_slots = mgr->proposed_vcpis[i]->num_slots; + req_payload.vcpi = mgr->proposed_vcpis[i]->vcpi; } else { port = NULL; req_payload.num_slots = 0; @@ -1688,6 +1689,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) if (req_payload.num_slots) { drm_dp_create_payload_step1(mgr, mgr->proposed_vcpis[i]->vcpi, &req_payload); mgr->payloads[i].num_slots = req_payload.num_slots; + mgr->payloads[i].vcpi = req_payload.vcpi; } else if (mgr->payloads[i].num_slots) { mgr->payloads[i].num_slots = 0; drm_dp_destroy_payload_step1(mgr, port, port->vcpi.vcpi, &mgr->payloads[i]);