From patchwork Fri Dec 7 15:54:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718397 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D5D4914E2 for ; Fri, 7 Dec 2018 15:54:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CEAC2DADC for ; Fri, 7 Dec 2018 15:54:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10A062DE75; Fri, 7 Dec 2018 15:54:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 69BED2DADC for ; Fri, 7 Dec 2018 15:54:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E0D0E6E7C1; Fri, 7 Dec 2018 15:54:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0609.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::609]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF1BF6E7B9; Fri, 7 Dec 2018 15:54:39 +0000 (UTC) Received: from DM5PR12CA0068.namprd12.prod.outlook.com (2603:10b6:3:103::30) by BYAPR12MB2632.namprd12.prod.outlook.com (2603:10b6:a03:69::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.19; Fri, 7 Dec 2018 15:54:36 +0000 Received: from BY2NAM03FT017.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::200) by DM5PR12CA0068.outlook.office365.com (2603:10b6:3:103::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.18 via Frontend Transport; Fri, 7 Dec 2018 15:54:36 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT017.mail.protection.outlook.com (10.152.84.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:54:35 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:54:34 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 01/10] dma-buf: add new dma_fence_chain container v4 Date: Fri, 7 Dec 2018 23:54:13 +0800 Message-ID: <20181207155422.15967-1-david1.zhou@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)(346002)(376002)(39860400002)(136003)(396003)(2980300002)(428003)(199004)(189003)(126002)(476003)(2616005)(426003)(68736007)(5660300001)(47776003)(23676004)(81166006)(8936002)(81156014)(7696005)(53936002)(8676002)(39060400002)(50226002)(66574011)(305945005)(54906003)(316002)(486006)(110136005)(4326008)(36756003)(105586002)(106466001)(2201001)(97736004)(86362001)(5820100001)(77096007)(478600001)(50466002)(1076002)(53416004)(2870700001)(104016004)(6666004)(356004)(2906002)(4744004)(336012)(186003)(14444005)(72206003)(26005)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR12MB2632; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT017; 1:E9nc8/UJvX6ae7G9ezuUO27Ga0F7NlcWX5ta5Ad+i2QWncN+fgq18KCnNGKFnBa34t4Mm7Qq5tsCCL3ccNekf/qT+Gu2+gT5mGGV6oo5mcZ9jW4S0wqvZE++eCE6CcDb X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 076a7dea-835d-45a8-1efc-08d65c5c49a4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:BYAPR12MB2632; X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2632; 3:t3cwSi2qZUbcJq4koiiTitmdZxfJSBHHg8hfEJS52WhqZZgosE4uN8I95nWB/xgj03k2wyby18T9sdq1Z5+rMeRC0csvQTv+25vn3V+KQfPR1XmhvW3jfyTo6bceNpO5oSKPkmZuRK5A4UQq+zIKL6u1ML8U1tlqjuoMwLLQgIwWDUF6DcEmCDSx6DfOeKRz7XyIceSfy+3nUxJnnqicD9BS9TJuQPUQZNUlsR4t2kk6H2gXNm008U3QN84AaDC+LjQ3xefDvU0uk5ifgb4eV1QmGomOHIGgDu8ZFIWjMYGLFo5KBIt7YLRHirD+GZMQb2sJJoiYPIb49ntsL8792iOYT5v5eV2hEpBX/kF6wgE=; 25:lzWOj3PDjmzm/uI6IXswPHMCvvqZ7pezHjpKbPnm3GdQmYFz4WBrR9DBlGo9xOVTk8/V8bWeVtbLM9iHKGHXEjVei9CDSstie2B3nUWQ3JiqhPs0DqNU60RaFKDxnYtrmERNP8Y1o/tNzTqP4ECSh5uwaEwB00TxZTIyIBzqHyMfcvdNKD5zXrSO+MKRPo4ACAjasQGG2D1Eb+l3RL+UNzyl3eXfRL+LJzCxx9c5tPVJDfL8qkWoEq8eHms0DTn8Ugp/OOzIibMA/KP2SoyCAeHAOjC9yAzoYQIDtPZmt8hloXXKvo3+6+QJGDJqCKCQ+bpa8YVltbPCryA47RtrCg== X-MS-TrafficTypeDiagnostic: BYAPR12MB2632: X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2632; 31:+h0aDxaLbFx6hR0puadx/3hpmQRSV54hP+LjSVvlX8eGfK7JpdlL/ta5JKEPFV0x4ooTyzYFVVynfqqC4oeH6brsUxMDrYXiABSA+m4e9FPjGBEcX54N0uJD9h3/0w3t3oCsKXjKVIs2XMzPZolQgh+96cuo8LJv+XTOPukkifh9dm2uTH9qBWDPCziampz9oKoDrtCUOhoGC7RbokkJwYJ8Ssc9WUarvaHy4nKtDrk=; 20:IG7e6mjW8mSzeGhONHvQ1uesJHu0Cd0X/4MnZ+GOzgIBUKo9RUhEfi6vhEyP0GRcqZXl0WwkmI0fLffyIpVXwk2tNqRQsI3VbqWTlKznxJVlfFYrnfwAnCvC95HBJ+FRbc5Fcko8sR4916W9vOPWV5/2bECYUKFfPyoIC+RWQJA4OE2dkk2rTZsAX77IMmaHZQnIUhbRWkB50V0OakJteIZrHV4G+gk9u2zoEa7gX0McuUok5mk+6Q2T4cBUlM5n+a1RZYBimtxQhM+BxNAQCel1xqG+FAvso+iY0zI8bFEPWpqQKjzSMXdcqadMaQ+pA3JzVhbHbeYtE1xSujoz8pSs+0zwQpvFJv0agG1/30pPbSQHBD4PCiSjVGnryuQLYuUxQh4AQR5HnjkmLljSe0cUn1m16rouqKWm1UNOnTEAMrLT2s8nciZ8cpMjngK2+bPVbn7+UQOE21GkgO0kVgUy7ltvJCTd3fB4bwa+0eqHRXqistaxKOJodNQDePO7 X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93003095)(3231455)(999002)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:BYAPR12MB2632; BCL:0; PCL:0; RULEID:; SRVR:BYAPR12MB2632; X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2632; 4:E2aeOPrSceth90C0rfC7YHokDFFTlS5ZwbtjONmBS1/54ygifS0bElRyBBG0sdHVuv5vPQgGYBxnlJ8KmPjLgDJ0ZJw1gQKwRq6wvsso9sMrgwF29381LXvnF/xc8jyQNEbe6qfPPqyqjUa37vyWqhXxEfoHtzQCoh3eAkfSjdRd+RdqW/VApR9fdUIlId8bXoUsBlOfweEPsA5slJ31TUJ8r9+Bqg6N2Dvw92pq8Oro2ndSaxT+gCUfzX6zh5sb3LYWZ6uEG5BQNo+PUmgP3w== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBYAPR12MB2632=3B23=3A9b4r70C?= =?utf-8?q?Saxih39CY6A5rdgqLRPa8QPLirsaz+mMi4EIsvQyGhDBVisl/PwsZM1la7E10AunZ?= =?utf-8?q?Necqh7D5bvLnbrfJTpSQ2MShhvWJ2jtzBRglrZBwmA5Uom8pzJRZWWGt8KyKFQoDi?= =?utf-8?q?WvESawZsJFKNm8Q53wDClGfks0PmfnVE2sKVHl4eq8rmbYQerNDcfkUu1fypJZN8g?= =?utf-8?q?wMrqSbJyo3Q3uOmmsxPEe72u1UhE1zHewNuszRtdLrVrdaHIpbjPcXl2i+MI/9hpE?= =?utf-8?q?d4Vymfpe+aQJxcVrPh96rx+BKpN6S+tUpZof8g1ZYgJ2JncKiLXacO9VX/NAfJEzH?= =?utf-8?q?NwB+XOnnWW6G/UV4NPa7E4MtFQHHG9RSC4eBDfQ/dDBfC3T1cb3BxC3LrInR+yzDH?= =?utf-8?q?9yLeUZdCjTzy/sggiwNPdmnLnR6os2y20LlbrFxdQ7fj/g5glVbv8ya81pMGmglz2?= =?utf-8?q?eOGC1NcMOlJPVfwMOJd3VQVSGxgIfQYwqdxyYrgq/hYunzS7CjQqX744B53A88beJ?= =?utf-8?q?SOJ6iFzwoTZpXCyWQLIV7/FQ5/SAsuBexx8kOQfPckFMSJm01hVHKsCmcdHavygpH?= =?utf-8?q?LvW2jXrEBeJ6DjRtKLd50GNqUJYYXcckXOB7Qzykpt74YMk1aJ0C2OuLI/VdZt73I?= =?utf-8?q?UHiUQFE9+bsU8p5YWvK+r28Qy35P7Fsw2HFxgjE/tm7ls0kWhn3mnhi3fwiuGjgYU?= =?utf-8?q?sSntfsEC1TT/coNf7Ojr9QfmRxmGtvQYqPbLKWO5fBUg5iJN9ph8HlQeX7kpzmvmb?= =?utf-8?q?CrGGXV399+l4L61wukRetYca9ngcWstkrYbiouTPv3EPsv5Q4J3JIFHs0RZVWo4WX?= =?utf-8?q?lEehpyunV327ORbCENytCEjbHHt/EQi9zWIv/ykWcMwjUxTBuQQyGF7wFAW/14P/8?= =?utf-8?q?hfZU0A9K+cOGcHf3PI8w6xPfTqUSdwfnWRa/zpO6tJEqceZf4D2dpmVdDRNRknTQL?= =?utf-8?q?fpDF+RVJPFEOO34Bs8n9JVRVYYtDmDRkzJlFT2AvbhoHIRiYGSwYaK1BTWbt3hwRl?= =?utf-8?q?+tDxd5qqxXw9s2wJFLB/PZuguw1jXAYF98iitpHrgjORY4ZEo+6K1BHpskTRoJgXP?= =?utf-8?q?k/h9StYfzSuF+0AU6g9irWQ5psLrJ/m/KzQOpBMB4AAiPTCTXsTo+OsXFo51kmbON?= =?utf-8?q?kDtQZoybGMLMExyZwPgFnq0YwCBALnGhEkCVHj8MkjXTyqNv4fcRJuwu8NSfvgO7e?= =?utf-8?q?U+J5GJeFOfOh1stfA=3D?= X-Microsoft-Antispam-Message-Info: PelnTpDEESmeFolzK2IEfd8MNwe8DV4Gevk/67lSTW2yj+wBxtbkPoNokBDgggp9j0CA8O4r5EqH2d6Q/I4dMQFxaHPNv0K3WGJTl1CqY9nyM9YYXF4Vw6PbybHOXfHnxRHidk921QCocCHbnHItIYz6Od5knJCWaniwD3/xNundqJQyD9Netctpj/Pzc18nWuYKY7e8AWuFUKsQbjsNLdxYjPsu8IEXpH24Gg5p8qnZ+cK5InKFfxFRXMsOr24r2Cv/RPC/iZ9yd4TDNySmo2ROOLauKe1pryODmT43EhFeCYgoUzSZT2mZ6knvavi29Yu+gutrjBBNf31KWlgys5B7dwhqVaoKyebOc9Ue1DA= X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2632; 6:v9Sd1jBN/PZGI7V8WzRn5/6KfL/d/42PGHxu4JtVZS1MJhi7YTyzyn7KQTqfiUMKwKWLYQ8eo6t5AqTWCaU24wHV1JWB7OL4NMSYjQzvvSVPtzQoUaSrsH5AO6TQcnaVqmTEWoRAC4w9zMEZKfgs8ETc+S6DmhY/elubNRd4mAdVB6L54hYywiAoJ4LlPgKaTcfJTUyr/sw/Fx057dtW9PPqYzVCes46e2xpHZghbQeBq+gt8z3dsZaNMJ8omywmWjh26qiYJGFm2eErFtZp2wTrLYePhs3bwbo50QoNSMTnJJDYfwKvOkW2CbhsrGBQrcbif1ofs2GtPTVBKT924tXpL9OfbxkYrsg2/9rxVpfbtoPBMG5/5+ZEh0DDVa+opfgltyIqtetdC1O0pwwwfiwn1sNJVkYyU4E8c244ypJQoYWMDXgsNjkI01KYrbK3Pr1csWj32/2v3/y8MEUaHw==; 5:8u1jZUUA6J7UB8G5wiRWtPCvR+yCKfbqfOAyUYcBXPXCcQlRpJmtw3lBzzCP5GQ4KKJp7H6OwDulTswefg5UAjMDoMWcFavFLgSbmnhKrnYwDYA/4+AYt+VIxaQgP8XNjlhl4akjKguFK0ZNc+E6vDzGvriVNfQ7k8bHElxkiB0=; 7:uWJoiqZFUrruWx9m8pHiaq/N0rY0Gm0frg0wpbS6+opRzTmX12oOYg/yoyo9dvKMxuvCF70v6u8LVSKyfN2GnycBoiK21qdOK+PbfiUfY9fy4j6LEXsMF6/Jt8B2nip713DSiwoWsNN0PqEEPzY+WA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2632; 20:B/ryeYahv2RVthU7idEtVXSXZXaTenZ8twfMRYOWT8AohubLPCW5mbemrUgF7tHlpNMqR+qfi5EfQYxXydm03aEyYH0HcjS9WSXK55DvCD2HZAm4t2lAHN2dnGXqFRRFU1fuXkdQ6xPnFgxWrU4HJ9bX7Ek1+kpWvxembGwlzzvoQpLE+7dTVoxbxON9gLRpCY+rfDfSNzeHW7WWhuo8lwqRji+VsgkcVLj2BfM/pCCWSIoN6VQmlQYtntMzdYXf X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:54:35.9243 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 076a7dea-835d-45a8-1efc-08d65c5c49a4 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2632 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: =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Christian König Lockless container implementation similar to a dma_fence_array, but with only two elements per node and automatic garbage collection. v2: properly document dma_fence_chain_for_each, add dma_fence_chain_find_seqno, drop prev reference during garbage collection if it's not a chain fence. v3: use head and iterator for dma_fence_chain_for_each v4: fix reference count in dma_fence_chain_enable_signaling Signed-off-by: Christian König --- drivers/dma-buf/Makefile | 3 +- drivers/dma-buf/dma-fence-chain.c | 241 ++++++++++++++++++++++++++++++ include/linux/dma-fence-chain.h | 81 ++++++++++ 3 files changed, 324 insertions(+), 1 deletion(-) create mode 100644 drivers/dma-buf/dma-fence-chain.c create mode 100644 include/linux/dma-fence-chain.h diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile index 0913a6ccab5a..1f006e083eb9 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -1,4 +1,5 @@ -obj-y := dma-buf.o dma-fence.o dma-fence-array.o reservation.o seqno-fence.o +obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \ + reservation.o seqno-fence.o obj-$(CONFIG_SYNC_FILE) += sync_file.o obj-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o obj-$(CONFIG_UDMABUF) += udmabuf.o diff --git a/drivers/dma-buf/dma-fence-chain.c b/drivers/dma-buf/dma-fence-chain.c new file mode 100644 index 000000000000..0c5e3c902fa0 --- /dev/null +++ b/drivers/dma-buf/dma-fence-chain.c @@ -0,0 +1,241 @@ +/* + * fence-chain: chain fences together in a timeline + * + * Copyright (C) 2018 Advanced Micro Devices, Inc. + * Authors: + * Christian König + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include + +static bool dma_fence_chain_enable_signaling(struct dma_fence *fence); + +/** + * dma_fence_chain_get_prev - use RCU to get a reference to the previous fence + * @chain: chain node to get the previous node from + * + * Use dma_fence_get_rcu_safe to get a reference to the previous fence of the + * chain node. + */ +static struct dma_fence *dma_fence_chain_get_prev(struct dma_fence_chain *chain) +{ + struct dma_fence *prev; + + rcu_read_lock(); + prev = dma_fence_get_rcu_safe(&chain->prev); + rcu_read_unlock(); + return prev; +} + +/** + * dma_fence_chain_walk - chain walking function + * @fence: current chain node + * + * Walk the chain to the next node. Returns the next fence or NULL if we are at + * the end of the chain. Garbage collects chain nodes which are already + * signaled. + */ +struct dma_fence *dma_fence_chain_walk(struct dma_fence *fence) +{ + struct dma_fence_chain *chain, *prev_chain; + struct dma_fence *prev, *replacement, *tmp; + + chain = to_dma_fence_chain(fence); + if (!chain) { + dma_fence_put(fence); + return NULL; + } + + while ((prev = dma_fence_chain_get_prev(chain))) { + + prev_chain = to_dma_fence_chain(prev); + if (prev_chain) { + if (!dma_fence_is_signaled(prev_chain->fence)) + break; + + replacement = dma_fence_chain_get_prev(prev_chain); + } else { + if (!dma_fence_is_signaled(prev)) + break; + + replacement = NULL; + } + + tmp = cmpxchg(&chain->prev, prev, replacement); + if (tmp == prev) + dma_fence_put(tmp); + else + dma_fence_put(replacement); + dma_fence_put(prev); + } + + dma_fence_put(fence); + return prev; +} +EXPORT_SYMBOL(dma_fence_chain_walk); + +/** + * dma_fence_chain_find_seqno - find fence chain node by seqno + * @pfence: pointer to the chain node where to start + * @seqno: the sequence number to search for + * + * Advance the fence pointer to the chain node which will signal this sequence + * number. If no sequence number is provided then this is a no-op. + * + * Returns EINVAL if the fence is not a chain node or the sequence number has + * not yet advanced far enough. + */ +int dma_fence_chain_find_seqno(struct dma_fence **pfence, uint64_t seqno) +{ + struct dma_fence_chain *chain; + + if (!seqno) + return 0; + + chain = to_dma_fence_chain(*pfence); + if (!chain || chain->base.seqno < seqno) + return -EINVAL; + + dma_fence_chain_for_each(*pfence, &chain->base) { + if ((*pfence)->context != chain->base.context || + to_dma_fence_chain(*pfence)->prev_seqno < seqno) + break; + } + dma_fence_put(&chain->base); + + return 0; +} +EXPORT_SYMBOL(dma_fence_chain_find_seqno); + +static const char *dma_fence_chain_get_driver_name(struct dma_fence *fence) +{ + return "dma_fence_chain"; +} + +static const char *dma_fence_chain_get_timeline_name(struct dma_fence *fence) +{ + return "unbound"; +} + +static void dma_fence_chain_irq_work(struct irq_work *work) +{ + struct dma_fence_chain *chain; + + chain = container_of(work, typeof(*chain), work); + + /* Try to rearm the callback */ + if (!dma_fence_chain_enable_signaling(&chain->base)) + /* Ok, we are done. No more unsignaled fences left */ + dma_fence_signal(&chain->base); + dma_fence_put(&chain->base); +} + +static void dma_fence_chain_cb(struct dma_fence *f, struct dma_fence_cb *cb) +{ + struct dma_fence_chain *chain; + + chain = container_of(cb, typeof(*chain), cb); + irq_work_queue(&chain->work); + dma_fence_put(f); +} + +static bool dma_fence_chain_enable_signaling(struct dma_fence *fence) +{ + struct dma_fence_chain *head = to_dma_fence_chain(fence); + + dma_fence_get(&head->base); + dma_fence_chain_for_each(fence, &head->base) { + struct dma_fence_chain *chain = to_dma_fence_chain(fence); + struct dma_fence *f = chain ? chain->fence : fence; + + dma_fence_get(f); + if (!dma_fence_add_callback(f, &head->cb, dma_fence_chain_cb)) { + dma_fence_put(fence); + return true; + } + dma_fence_put(f); + } + dma_fence_put(&head->base); + return false; +} + +static bool dma_fence_chain_signaled(struct dma_fence *fence) +{ + dma_fence_chain_for_each(fence, fence) { + struct dma_fence_chain *chain = to_dma_fence_chain(fence); + struct dma_fence *f = chain ? chain->fence : fence; + + if (!dma_fence_is_signaled(f)) { + dma_fence_put(fence); + return false; + } + } + + return true; +} + +static void dma_fence_chain_release(struct dma_fence *fence) +{ + struct dma_fence_chain *chain = to_dma_fence_chain(fence); + + dma_fence_put(chain->prev); + dma_fence_put(chain->fence); + dma_fence_free(fence); +} + +const struct dma_fence_ops dma_fence_chain_ops = { + .get_driver_name = dma_fence_chain_get_driver_name, + .get_timeline_name = dma_fence_chain_get_timeline_name, + .enable_signaling = dma_fence_chain_enable_signaling, + .signaled = dma_fence_chain_signaled, + .release = dma_fence_chain_release, +}; +EXPORT_SYMBOL(dma_fence_chain_ops); + +/** + * dma_fence_chain_init - initialize a fence chain + * @chain: the chain node to initialize + * @prev: the previous fence + * @fence: the current fence + * + * Initialize a new chain node and either start a new chain or add the node to + * the existing chain of the previous fence. + */ +void dma_fence_chain_init(struct dma_fence_chain *chain, + struct dma_fence *prev, + struct dma_fence *fence, + uint64_t seqno) +{ + struct dma_fence_chain *prev_chain = to_dma_fence_chain(prev); + uint64_t context; + + spin_lock_init(&chain->lock); + chain->prev = prev; + chain->fence = fence; + chain->prev_seqno = 0; + init_irq_work(&chain->work, dma_fence_chain_irq_work); + + /* Try to reuse the context of the previous chain node. */ + if (prev_chain && __dma_fence_is_later(seqno, prev->seqno)) { + context = prev->context; + chain->prev_seqno = prev->seqno; + } else { + context = dma_fence_context_alloc(1); + /* Make sure that we always have a valid sequence number. */ + if (prev_chain) + seqno = max(prev->seqno, seqno); + } + + dma_fence_init(&chain->base, &dma_fence_chain_ops, + &chain->lock, context, seqno); +} +EXPORT_SYMBOL(dma_fence_chain_init); diff --git a/include/linux/dma-fence-chain.h b/include/linux/dma-fence-chain.h new file mode 100644 index 000000000000..a5c2e8c6915c --- /dev/null +++ b/include/linux/dma-fence-chain.h @@ -0,0 +1,81 @@ +/* + * fence-chain: chain fences together in a timeline + * + * Copyright (C) 2018 Advanced Micro Devices, Inc. + * Authors: + * Christian König + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#ifndef __LINUX_DMA_FENCE_CHAIN_H +#define __LINUX_DMA_FENCE_CHAIN_H + +#include +#include + +/** + * struct dma_fence_chain - fence to represent an node of a fence chain + * @base: fence base class + * @lock: spinlock for fence handling + * @prev: previous fence of the chain + * @prev_seqno: original previous seqno before garbage collection + * @fence: encapsulated fence + * @cb: callback structure for signaling + * @work: irq work item for signaling + */ +struct dma_fence_chain { + struct dma_fence base; + spinlock_t lock; + struct dma_fence *prev; + u64 prev_seqno; + struct dma_fence *fence; + struct dma_fence_cb cb; + struct irq_work work; +}; + +extern const struct dma_fence_ops dma_fence_chain_ops; + +/** + * to_dma_fence_chain - cast a fence to a dma_fence_chain + * @fence: fence to cast to a dma_fence_array + * + * Returns NULL if the fence is not a dma_fence_chain, + * or the dma_fence_chain otherwise. + */ +static inline struct dma_fence_chain * +to_dma_fence_chain(struct dma_fence *fence) +{ + if (!fence || fence->ops != &dma_fence_chain_ops) + return NULL; + + return container_of(fence, struct dma_fence_chain, base); +} + +/** + * dma_fence_chain_for_each - iterate over all fences in chain + * @iter: current fence + * @head: starting point + * + * Iterate over all fences in the chain. We keep a reference to the current + * fence while inside the loop which must be dropped when breaking out. + */ +#define dma_fence_chain_for_each(iter, head) \ + for (iter = dma_fence_get(head); iter; \ + iter = dma_fence_chain_walk(head)) + +struct dma_fence *dma_fence_chain_walk(struct dma_fence *fence); +int dma_fence_chain_find_seqno(struct dma_fence **pfence, uint64_t seqno); +void dma_fence_chain_init(struct dma_fence_chain *chain, + struct dma_fence *prev, + struct dma_fence *fence, + uint64_t seqno); + +#endif /* __LINUX_DMA_FENCE_CHAIN_H */ From patchwork Fri Dec 7 15:54:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF0D715A6 for ; Fri, 7 Dec 2018 15:54:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A1022DDBF for ; Fri, 7 Dec 2018 15:54:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D5252DF43; Fri, 7 Dec 2018 15:54:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A6F632DDBF for ; Fri, 7 Dec 2018 15:54:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B3C76E7CE; Fri, 7 Dec 2018 15:54:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-eopbgr810081.outbound.protection.outlook.com [40.107.81.81]) by gabe.freedesktop.org (Postfix) with ESMTPS id 510C26E7C4; Fri, 7 Dec 2018 15:54:46 +0000 (UTC) Received: from MWHPR12CA0041.namprd12.prod.outlook.com (2603:10b6:301:2::27) by CY1PR12MB0057.namprd12.prod.outlook.com (2a01:111:e400:4c2a::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1382.22; Fri, 7 Dec 2018 15:54:44 +0000 Received: from BY2NAM03FT042.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::207) by MWHPR12CA0041.outlook.office365.com (2603:10b6:301:2::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:54:44 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT042.mail.protection.outlook.com (10.152.85.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:54:44 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:54:43 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 02/10] drm/syncobj: remove drm_syncobj_cb and cleanup Date: Fri, 7 Dec 2018 23:54:14 +0800 Message-ID: <20181207155422.15967-2-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207155422.15967-1-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@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)(136003)(346002)(376002)(39860400002)(396003)(2980300002)(428003)(199004)(189003)(6666004)(72206003)(23676004)(478600001)(356004)(105586002)(47776003)(50466002)(106466001)(8676002)(81166006)(8936002)(11346002)(53416004)(66574011)(126002)(486006)(5820100001)(97736004)(81156014)(14444005)(2201001)(476003)(446003)(68736007)(575784001)(86362001)(2616005)(2906002)(186003)(336012)(53936002)(426003)(77096007)(50226002)(1076002)(26005)(5660300001)(316002)(305945005)(39060400002)(76176011)(54906003)(4326008)(36756003)(104016004)(110136005)(2870700001)(7696005); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0057; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT042; 1:wx+ch4QlczFSJFGyrQCwJvGY+kzsday0co/SJyvFgsE9D5epD/eBe7USynXjFgfPOEeOvKW4qIzGzh0odlfwMoXilq0tYreOaSiTUm3rrwxhc+9JzRDmMptArM9/SzF9 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a464519-d53a-4a7d-2c5d-08d65c5c4e8f X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:CY1PR12MB0057; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0057; 3:7zTOGfXxWkwA2W69N4pfUi6xZO+AM8F7v6rpn0n4mYu71OnX0vd/zdeiAfiI7AbVcBpAPzzPqwJVKsiMMnzTJx5l+pY1cnpLjYFyqm8Y5HkqOFxGLHh8k9EQkGP6yE7P6LUicQKCe8vJSYpv+w7ZuJQ3K/zNoNjn+MDn0bz5FDIFWSpJDmTjeG3yBB/SEustWPEZMLFE9fo7sUnWQrR3cCi8pCiEjvgKvymWE6XZUwhwBN0uLfCX3wh3PxB5c4M4sKgWAd2L/Byy97L1Hvas9+CL5KKCAgQ4m9ykW8Fj7WONeFptg/ZC9yfncwTBLWJeVp3MUZRfwiTUmL6oRdX7Q3fGlnugzI4iKw/VFV+NmsQ=; 25:7UK9Y61z5l6yhe5GJhE3w/CZxi91eysAIYLgTbThjojF1ESiSt5fkwpOrBX0BjsPXZILeKQOT1YZI6hBpnjv0K3HYdW/OrDUURzs8tpvlxJb8vHfR1az7u+BdSVt/bk/XxfQ5AK/lGq7ZUBMeZEZutjza79/AXEhlJ1kEOGV7CNnJxBl9waUGfJNmT4ccOctKbL2YfmW2qk8tnE7Xj8BIwU/oaDCuY9riz04yq8f3rTL6/hwEsckJ452GQ7gcqJn3aRgzbMc9GekFXtXWpYUiircSbXmRW0fb3v201EgXzYn22R3ll+zUFIieSwLC2RfQ1jeYTcTAJ13c9A2lgF9RQ== X-MS-TrafficTypeDiagnostic: CY1PR12MB0057: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0057; 31:OYfCFdcng7i6SvFYwLX4ygr6o/NJodneogBOAlJKf/f0g33FMU3Qs43363XsKjL1eVGhu0XiezIWTGkTfCFdkusrRa0qD/M3mzOd9C4sFqz6JL5enJIyN0bT09NGmYbYehrwFiM0gTOzV9310HhFThyFRrdVtGYrX42OJAZ612/5hXlxJ6sLWE0/6whiogy3T/L7yacPT74761QpPYd1uiNzSjuCah6OgL+cODtmoI0=; 20:efD6n5Xj1fKedc2ntrafWWEJMey1kq3wPUKOj1zs2u3ALtf/Osffy3n6R8wPkXZ+jXTYfMFxwnGfanI1yTbopOPUcwGtqvDFIyf/rC77KgQ9E+zi1QNBSYcYSGCJFpSQ1QzyWIagUlgsyVX2JHBgLkDNJ1Bpcywo5Ud9Yk9tE9o9ADucSC0R2BOwx6rDlyYs8D8X6PIObmJSFsplIdyPeUpxkm8sY7xgElAuxJ0UrcXi/7s/mHM7i4+/akvY4h9kjbnlxB4PE9D8KRmxx62JgPYDpr4h2hEkVJULlFh3GY2wlaJcdvvNYjQQrh62pNTl1z3gyRtU0dz8fAf4JV+zPs6z6oZ1KI4+486iCcJB8O3djMdjgqocS3l7/UvZONWMAdzZyuKkaclXt0fLfrSouH9VxdyIpbFmD2nATiblt1hZT7PC9ZtKd6UvabguGZVfmXLfQmXwQJVsn07BU1ILq+jt8UuklvbaP7ZGSjePp/d21+BiOUpCGjIZTKSNI4Is X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231455)(999002)(944501520)(52105112)(93006095)(93003095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:CY1PR12MB0057; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0057; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0057; 4:N1ueGrMD45mY5TJornZl3zS2Rh+UYNSoSfraQUdTnfryUC0kWRicj5Mf/jV0n7p1kkn3x84gPcw70tDhPNRT1OeGqub81IhS9fLQc7s4lAnXEKW8DceyvqjTG1q9iGKQQOklz/TKI8MBXhw46MvxqcJ9SNwXVedhq0vReZQ4DI41m00uD+hA1g96z6pXnqYWl+zano16VYppO16AGgBrmE3OMhPNZFUY9xgDO3O/ZjCHBIJ4ytMxSc/NogWaxW1EDlaXLWXHkeA+8yl+bhzVHA== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BCY1PR12MB0057=3B23=3AJhkCaan?= =?utf-8?q?U2S1kqqEu/HbPqJuGwzQ7rxlzK/9zV/E+k/Mgd7bmngIFNAZu3MYn7LYjuF9mVNuJ?= =?utf-8?q?E7Csp8u4MTjCUhncSdD7+6XQRllAj5Hqcu/+HtlHtOseTA+MqNiSfjcrt2rgXOuBH?= =?utf-8?q?KVEVEiKJ8RUMb1o/enEf12wzBy0lwPDcsQXiTxcsUNcE50uAHDg5k6mGE8L4Kyq6d?= =?utf-8?q?MnGVLuOosdw6eUmwr4Ev/ofoub1Z/EXACBvZSsWzhm2h1Xo7Z42O6Up7+nXbQT5vW?= =?utf-8?q?H5w+RvQ3s5u6p2gNct9Giv1poGLfVGdOC3B7xytDMALvl6IpfMz2NaLe/bXQPvVwE?= =?utf-8?q?i+64F/UOknD9Keof1pWdAQIPkUs2ziy/Dy8j5Fn+NBFe9IaHd817HRvYKDviv3S9H?= =?utf-8?q?MDSo1mRqM3dF+2g2sS8sUsotePcXPXVVTzTilM2vpmvC+cZId8JARElsSES+6pwcn?= =?utf-8?q?CaRZlLDt/U6h067WRmzujIzLrJk/kn9T19OOUuGEbrsnEmtRVAafB1emNmFNKzO1z?= =?utf-8?q?XHYdWQwlZ41yJPS2eP2p+7KlJ1Vd4wVdmsIEyOILIaVbSJjYKz8lgTzILqRS8Riuz?= =?utf-8?q?+BNMgwHLdvGlXkUH62ie7G589gB8XzB+gPGY9ieq3Jy51xvmV5GSZJIz9TKJQgmu7?= =?utf-8?q?MKMB8RzKXD96f2Ds9aSbsrwt2FRdehjr8Zh3G2TzrhNcZu56aHfxqB2ecS07F7jvD?= =?utf-8?q?jTHtuTlI9WbXvw8A+1cVoN9UAEA2WWS8S1DJf4l89Fi8yUPvbsMCzz5ky0RyGPeyd?= =?utf-8?q?lP/6QRkBR1txJicNUsYprH6TTbbN6sHRIlSLxzotngD/l2fKwDeN41isMHP+2trq5?= =?utf-8?q?cj7Y9C91Y5ox/6mJZzuLVsWQjhOshYQoxe3eQdLMS//mLXluZb09YgczK1M9XfGsn?= =?utf-8?q?xEtytmK3lxK7wk3+aZufYfj3x/hJj6TDcmTGaRvUmWy5N6hs/Ix4L13IJ6Jb8WFrg?= =?utf-8?q?caYfK0XBW7Z5DlUTXKiu8ajhRAmHUDt7hNrXdTfShzIzCFTz9fHZHzkfkffVcXJ7H?= =?utf-8?q?JZQTS0LQl37LBn+5Cwf0KMIGZnLsvEXB7xjz5W2RQ82G96KeSopTih4pl9KcN3nIU?= =?utf-8?q?BZ9LDKXUpGgFbfLXUM0QJ4mhBgKHvef2g0jB8QNziSPOnz7m9AX9qBPuhiLlU2WmQ?= =?utf-8?q?c7GNzgqNixRNAjyubQlhdgmQ7JqsE+ig7w6x2YvLnjDKBS9HOFINmGK7kzvWUFVlU?= =?utf-8?q?OMeZFcRuvu/arUo5JBmZFZ9RBI55phs2n6oEbm9pmfggY+b+bPACYBGPnSig=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: rD38ruvRRwxGcXgKGwTHAIC8m5/qoupbTTyRL034gEO3fD/M2Y6I2nn4cCaqNLfkF8C9DEESf/J6n6HQcNoXPCdDT6VVBSZvpoI4fOvQdrTN9PG3MXQakr8F5aNlsGN0MG6gwV2R5RDC0s/0htHCQcRWCPipk4PwAQRExMSVgsZWAg33zOeq/LloCM9qWANMKDpnZ0bpLQ9J6bRx9tDfcaDm9+EtKJOoOiSR0AyNkYfXlB8XDOl+EJAiKzpdUg9UUmzeW/uxNweb693ViVtUyv4JDOiV6rmDb5l5yzfNCp+AZ2nIahxLKvw5VN4sefppm5OCWDJxaHxhhDLNH88u9xY13eknRvqw63WDUVFDLuA= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0057; 6:qls5F68yeTlFWHqJrhsOycOEfb/bxGn2GP7MK0g0SKZXxUFfYiF0C9gC+1zCvegOcaFNy9L1cNN4xIXPqzLxWa2FK1SjPvmB6a0f6lQ+quJyV2om4GwGqE+1MAH1X0yhb7dkmlA3YjBg3Fr+HJcFnqr0J1a15w3bdQlFZpCY41rK64DiXPwCqwAnO8Tx/6rn+rmsG37dspXiPRAdzoIVxuTrwmuqAvXHLfIcyqk5OBXfi6UUiivUmj4Wq2SzvCmFTUnnTabY1KY9Uz3a7K+TXrbDl4ADgk+fsVsIuz8xm7yBX/BaSzQNJ4ZMLP8JHw1TMtxyS8KVOFURrAHrcFQEild3Kdyk/CaMECKj0Ht1zpWi5eRKb9/gYqXVaiGR7XneTgHAVej5NXcQTI7nwC4YwrjowhNEg6yPOanRfHxW0hpP/5cxcoAoinwrQZrEUCqkJVEeBvlBuBoLW0+JCuUc6A==; 5:cXjqYrO1lMpY4Zdp2Kvu++HBE74C/hSceMV0L81ZCUwW9btodQdwgZKx04MMNTBrOUrwwpzxyz8rSisfkNXG+bhIG9t3fH0c7VlUuRlXrt4y+70nLhnAdaOhb/utdd3i5PoCXPI5JF0SFnOF3m/ZoyKEYqaDzK87RVxMZnYsIIA=; 7:bp072P7QLepJ0ppHUj8uZirfGoFPh4wkzwQCckXvRP7GIRLzQ1KwdFnTdNtaLRiz7a1PYzuHPKum1md/kWJqtDm3r6c3gY7U+8uB5GrUuyVp6JYCGtgprqrMHOgKtVRS/z4zwdNgNtUiPMPTK0yR5A== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0057; 20:LHPBPlSzJoTDGDyIAhXVqoyN12mzDwmt/UWbIbmJoZTjIf/bNLeoGd9Y3cYl3LJV4N5sZpW9V1ZOQMSZ/Y2dXfuVUHf9GGdUx3CzBW8wf83xsBhXSrFqYUt8ahNN8D3PERlF7Hvv0rSi8nu3K8lxJ0qbxbDGV1MaL31FDvaqRpTIp/R0/NB9b0fX2QiG3x4suCuIHCUZZfccAyw2bFk/mrZcX/m3kMAXKmjXXF3kCDHikhvl5ZJZrDwYh5fvloB5 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:54:44.2537 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7a464519-d53a-4a7d-2c5d-08d65c5c4e8f 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0057 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: =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Christian König This completes "drm/syncobj: Drop add/remove_callback from driver interface" and cleans up the implementation a bit. Signed-off-by: Christian König --- drivers/gpu/drm/drm_syncobj.c | 91 ++++++++++++----------------------- include/drm/drm_syncobj.h | 21 -------- 2 files changed, 30 insertions(+), 82 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index db30a0e89db8..e19525af0cce 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -56,6 +56,16 @@ #include "drm_internal.h" #include +struct syncobj_wait_entry { + struct list_head node; + struct task_struct *task; + struct dma_fence *fence; + struct dma_fence_cb fence_cb; +}; + +static void syncobj_wait_syncobj_func(struct drm_syncobj *syncobj, + struct syncobj_wait_entry *wait); + /** * drm_syncobj_find - lookup and reference a sync object. * @file_private: drm file private pointer @@ -82,58 +92,33 @@ struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, } EXPORT_SYMBOL(drm_syncobj_find); -static void drm_syncobj_add_callback_locked(struct drm_syncobj *syncobj, - struct drm_syncobj_cb *cb, - drm_syncobj_func_t func) +static void drm_syncobj_fence_add_wait(struct drm_syncobj *syncobj, + struct syncobj_wait_entry *wait) { - cb->func = func; - list_add_tail(&cb->node, &syncobj->cb_list); -} - -static int drm_syncobj_fence_get_or_add_callback(struct drm_syncobj *syncobj, - struct dma_fence **fence, - struct drm_syncobj_cb *cb, - drm_syncobj_func_t func) -{ - int ret; - - *fence = drm_syncobj_fence_get(syncobj); - if (*fence) - return 1; + if (wait->fence) + return; spin_lock(&syncobj->lock); /* We've already tried once to get a fence and failed. Now that we * have the lock, try one more time just to be sure we don't add a * callback when a fence has already been set. */ - if (syncobj->fence) { - *fence = dma_fence_get(rcu_dereference_protected(syncobj->fence, - lockdep_is_held(&syncobj->lock))); - ret = 1; - } else { - *fence = NULL; - drm_syncobj_add_callback_locked(syncobj, cb, func); - ret = 0; - } + if (syncobj->fence) + wait->fence = dma_fence_get( + rcu_dereference_protected(syncobj->fence, 1)); + else + list_add_tail(&wait->node, &syncobj->cb_list); spin_unlock(&syncobj->lock); - - return ret; } -void drm_syncobj_add_callback(struct drm_syncobj *syncobj, - struct drm_syncobj_cb *cb, - drm_syncobj_func_t func) +static void drm_syncobj_remove_wait(struct drm_syncobj *syncobj, + struct syncobj_wait_entry *wait) { - spin_lock(&syncobj->lock); - drm_syncobj_add_callback_locked(syncobj, cb, func); - spin_unlock(&syncobj->lock); -} + if (!wait->node.next) + return; -void drm_syncobj_remove_callback(struct drm_syncobj *syncobj, - struct drm_syncobj_cb *cb) -{ spin_lock(&syncobj->lock); - list_del_init(&cb->node); + list_del_init(&wait->node); spin_unlock(&syncobj->lock); } @@ -148,7 +133,7 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, struct dma_fence *fence) { struct dma_fence *old_fence; - struct drm_syncobj_cb *cur, *tmp; + struct syncobj_wait_entry *cur, *tmp; if (fence) dma_fence_get(fence); @@ -162,7 +147,7 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, if (fence != old_fence) { list_for_each_entry_safe(cur, tmp, &syncobj->cb_list, node) { list_del_init(&cur->node); - cur->func(syncobj, cur); + syncobj_wait_syncobj_func(syncobj, cur); } } @@ -608,13 +593,6 @@ drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data, &args->handle); } -struct syncobj_wait_entry { - struct task_struct *task; - struct dma_fence *fence; - struct dma_fence_cb fence_cb; - struct drm_syncobj_cb syncobj_cb; -}; - static void syncobj_wait_fence_func(struct dma_fence *fence, struct dma_fence_cb *cb) { @@ -625,11 +603,8 @@ static void syncobj_wait_fence_func(struct dma_fence *fence, } static void syncobj_wait_syncobj_func(struct drm_syncobj *syncobj, - struct drm_syncobj_cb *cb) + struct syncobj_wait_entry *wait) { - struct syncobj_wait_entry *wait = - container_of(cb, struct syncobj_wait_entry, syncobj_cb); - /* This happens inside the syncobj lock */ wait->fence = dma_fence_get(rcu_dereference_protected(syncobj->fence, lockdep_is_held(&syncobj->lock))); @@ -688,12 +663,8 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, */ if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) { - for (i = 0; i < count; ++i) { - drm_syncobj_fence_get_or_add_callback(syncobjs[i], - &entries[i].fence, - &entries[i].syncobj_cb, - syncobj_wait_syncobj_func); - } + for (i = 0; i < count; ++i) + drm_syncobj_fence_add_wait(syncobjs[i], &entries[i]); } do { @@ -742,9 +713,7 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, cleanup_entries: for (i = 0; i < count; ++i) { - if (entries[i].syncobj_cb.func) - drm_syncobj_remove_callback(syncobjs[i], - &entries[i].syncobj_cb); + drm_syncobj_remove_wait(syncobjs[i], &entries[i]); if (entries[i].fence_cb.func) dma_fence_remove_callback(entries[i].fence, &entries[i].fence_cb); diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index b1fe921f8e8f..7c6ed845c70d 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -28,8 +28,6 @@ #include "linux/dma-fence.h" -struct drm_syncobj_cb; - /** * struct drm_syncobj - sync object. * @@ -62,25 +60,6 @@ struct drm_syncobj { struct file *file; }; -typedef void (*drm_syncobj_func_t)(struct drm_syncobj *syncobj, - struct drm_syncobj_cb *cb); - -/** - * struct drm_syncobj_cb - callback for drm_syncobj_add_callback - * @node: used by drm_syncob_add_callback to append this struct to - * &drm_syncobj.cb_list - * @func: drm_syncobj_func_t to call - * - * This struct will be initialized by drm_syncobj_add_callback, additional - * data can be passed along by embedding drm_syncobj_cb in another struct. - * The callback will get called the next time drm_syncobj_replace_fence is - * called. - */ -struct drm_syncobj_cb { - struct list_head node; - drm_syncobj_func_t func; -}; - void drm_syncobj_free(struct kref *kref); /** From patchwork Fri Dec 7 15:54:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718405 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA98A14E2 for ; Fri, 7 Dec 2018 15:55:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36F8F2DDBF for ; Fri, 7 Dec 2018 15:54:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2AFAD2DF43; Fri, 7 Dec 2018 15:54:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D68572DDBF for ; Fri, 7 Dec 2018 15:54:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C40AD6E7CB; Fri, 7 Dec 2018 15:54:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-eopbgr800059.outbound.protection.outlook.com [40.107.80.59]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22C816E7C4; Fri, 7 Dec 2018 15:54:55 +0000 (UTC) Received: from DM5PR12CA0052.namprd12.prod.outlook.com (2603:10b6:3:103::14) by CY1PR12MB0059.namprd12.prod.outlook.com (2a01:111:e400:4c2a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1382.22; Fri, 7 Dec 2018 15:54:53 +0000 Received: from BY2NAM03FT004.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::201) by DM5PR12CA0052.outlook.office365.com (2603:10b6:3:103::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.19 via Frontend Transport; Fri, 7 Dec 2018 15:54:53 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT004.mail.protection.outlook.com (10.152.84.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:54:52 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:54:51 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 03/10] drm/syncobj: add new drm_syncobj_add_point interface v2 Date: Fri, 7 Dec 2018 23:54:15 +0800 Message-ID: <20181207155422.15967-3-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207155422.15967-1-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@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)(376002)(39860400002)(396003)(136003)(346002)(2980300002)(428003)(189003)(199004)(4326008)(47776003)(316002)(2870700001)(77096007)(575784001)(86362001)(50226002)(5820100001)(68736007)(305945005)(76176011)(14444005)(6666004)(8936002)(104016004)(53416004)(486006)(2201001)(5660300001)(81166006)(126002)(106466001)(54906003)(110136005)(81156014)(39060400002)(2906002)(356004)(426003)(2616005)(336012)(50466002)(11346002)(186003)(23676004)(36756003)(446003)(8676002)(7696005)(26005)(478600001)(476003)(105586002)(1076002)(72206003)(97736004)(53936002)(66574011); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0059; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT004; 1:VWK3vQ2aB/iX/gwnPNpD+kgKP7ku/jGVggnm/0Kav0NKH6kq1rjs4rG4jnAutNJMATTvYTMi5QttPODmIgqC6KKCIKt3J7TIAx+d0xyDU5OFwwLFJNEwD6SIpDqmn+0h X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8499edc9-bff4-4f03-23ed-08d65c5c538d X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:CY1PR12MB0059; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 3:JMAdYL70q0Locrbz7rYD0x2fjqYf6clnYcRkWapYI1q/dR4BstJ8b9GyYeASS+GYLI0/a9ETWaNvPDk2CR3DpeqfNaq6gnycmeQbLga7+kVQcOOp/XfqDGzQ5FMFsDzAn42nbZTTrJ9h7sDDHEvPFcM2/7DYYfuyqHHaUbMnsBdnL1GuDp3CaKm1CmGtBwv0osZgCvsS3nO+/WJp9qZQXG1QcA0Bh6VxocIbdJZ1IF77/f2Ko+bCcfTNp2W6M8UJ9MBCyvGdW5zwR8jzuHz5MtdPlNgsBq6PH53kCsyi0Zrq6n3tCrlKm6/icl14Y3dF+emNxIHQ+1xCE+JdEVofmdEDyrow5SJa6dqXXTD6ARk=; 25:mpvh8ktCLBdeJEzuTKbq1VXbb8Dr3zf980wqoHkK5Ko0Wq0bNqDldeoJWfW/Sy9TN9ikxGQx23qGh8k4Xm+NMaT4vo8/Bk94YI0fia5700GZp16EdlkUAKLDklnGZQ6CCAQpZA41C2Q6HR1gZE76AH6j2JHjP7iY+svlgwn05d6GPr/rI/2EQiS1qslCVIyVMMuNADov/PeIxavv2SrYayHj6NsujYbnm9seM9haFQ3Xc8/eFo2n4GqiPIJmNnbOlpltTcM2EVmYr1tzZwwZTv0AVBKltCZ9sIuyJLqG957Yp4LLjXQi+A4T/UIbggBy2UcCmVX2XVzti1EYJDGHbg== X-MS-TrafficTypeDiagnostic: CY1PR12MB0059: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 31:vYzWinrPveIdxx7GVuzNNXV/JmSGt0gZTzrVlIxDAxs+yJjKfOxnf9VXVOPVTJ0XbLqsLqbdvDkNuSUtc8zi7z73QE3wmqkaJNqmuqnEDSK+IYzTcx7NoXdNuPyOExqr4jZDwd6cijsn7lMIyfKR8688ow33FxFU7fatf3DjVdsWZLzFGan84UYDvqrQP9W+HUBQJjhs6WefS/0sQvgzb6reQZLEh2kbDAtEjABLHfo=; 20:QuAIKfbfVVXM+U3lcslseiFMIk2bU0vI5RAQoPswfXo4h7a3UaXicnuJ6hFVocMVYjd3vB1jKBZP0pDQf2H6eZobVQYZWrYjg2SGaliYzyCXrpbBcfDGEkc8UX+22+4lJj0iFvvWPiVEGMwWXY6Vwp3do3ghvYDBELAaZXo0n0+ajAQQhlMCHRRLS2ax6Pg0MkBkZSUpV68FnIKZogrCNAxJ6qxBZLvVe9nKFcqPCpujECNAunBpZfqWAJhSFIMxMJQWZn+gsUod38F7tPhkD1fzSRgt3J2Jf/6cLUzvARo/xEqO95rZJwUBPoHTXc/qulws7aSsH6LtuD39RYeQouNqxXQzaFIVYLa//TbVteZsLxGb4MQXUm5OLZ6llq1umdBtxMgdWod+FVSkxZxSQU8UxLV+m59y1ZhCr2tYVufjWWmhcwlA+fZBP9iHVigmTPIEhrrjTqQe5YWZVvPCTvdBRzwARoh1DcigKmNW4FM5RZt4cHpD2IO2umexXOqW X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93003095)(3231455)(999002)(944501520)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:CY1PR12MB0059; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0059; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 4:9Kwih0QigLIcU/NE15OHtvPXUZViXZfw6jDSS7gOrfb5+AtPpv7ZunWCjf3G1qEJl+lAIPPvKRiq6HNLJFB0hp8Xno5q0n5JATwjnp6OBJABFpl9hFWZpsptEIS7xMvsj/+78fHkYNpq7pB8AeNUOl+dPsz8ZGLRJALwo2thZrvFB7wHKhpz0jpjwFHtYyQj99JiYTlAytpBJpB60An1GQrtKvLP55dV6+niKIw5T/zHHp/QOWs9pCdSJcxdnwGD1e2MzFYn1u4YV/JBd/Gi9w== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BCY1PR12MB0059=3B23=3AZ75qZKA?= =?utf-8?q?3XzgwX+DtvOMFTv5RXArXcFCOC+0GAT+lol0rm3CA52prSpG4HYmjfef0q13RD9TM?= =?utf-8?q?X8lcOOFAvSeSMjkyl44BoFcbQ4GC8bMa4QDo1atjXSFrZJX4w88OCqQUWJw36Fp8E?= =?utf-8?q?1BUqrKw2aln0Tgcp1PsEg6jn7KwMK2oYIebFDa9Hgjm9x15gLrihW4W6+hidRUPub?= =?utf-8?q?3SJufFwe58TxQ93KvjCl6jEtpIOf86GV5gmVjZyW8rF8KZrPeewWWSB8Yg4YeUuw5?= =?utf-8?q?Ffcou4lW+0+OJessvOOaoxbm908ynUI5Me6p1g2adcsiWv1+x/8xq77C+OFun/ijG?= =?utf-8?q?spEcPbsJl665FxSbzvTeQ4MfC8pwl5adjm/A2DsKcZPmoPxSUVWIYPFkhLBUiQr2D?= =?utf-8?q?VOxuCrZFgyHb8mURyLS7YKTRxcjxoMOORklq4a5H7B72eybk0CryZsR1NZ99C0A81?= =?utf-8?q?FPYfIiqwaE5JNeY7X2ifwvAzOjidkZi6eW+R7esS30m6uBitQz2CUewmiEkqwgzqK?= =?utf-8?q?5RIIBs2HNzC27yHYwvzMHbsKmpu8DbnNTZPNbij2h736TOusKo1TBaad2ESgfLUtF?= =?utf-8?q?mGWqJtmXfYxS6HMkpc/5SRdSruYajgvkyMzOPwbNeMvskaiUAR5eMHVEGM8hUHmXR?= =?utf-8?q?TpgspyGvDA9v0nEd5A/JXOCkJOpGebq1bstvcqWqS2GHUHuBFY32Z1V1S9cKzLe5P?= =?utf-8?q?Q1bKTDQGVwYjyFUqZPnsP1rTecxa7sNY8CBDMeuWFXH4SOd82d/7QK8eyOFIIRUIr?= =?utf-8?q?3+EdljSDVjXKvCgBedd/zx5hUjDLE5Jxr7Z6TNX5V8/9ahfYi9oP0j+yWrDF8OlPP?= =?utf-8?q?6FAklX1YF3bhJ1hNVnzhdwJtMWe+yNiZh0Y7RNe9F7IOpaiMKv7o/cW1RBmyBD2Cb?= =?utf-8?q?tuOHsjk/81tdBy8uJu4BEtkWfuf/6xkM1w43g5F6qg0BUKqZUVYPImnSCcEsC1eW9?= =?utf-8?q?8eHcnBPSmzQtz6o1qbTzuwZYDOvLMG/jzpXccs4gRUwwY6hbbqaJJ/5ZMpbg2IuSV?= =?utf-8?q?9dxBIF/mRTy0Ta70QJhUpe/medoRlP9Sq/1fvfiwJ2+Nldk/2pkkRmzAzRGw8196D?= =?utf-8?q?EhD7n7+QydvGgGQ4XfD7H4O57ew46D0eUO7BH9LISXsexQKy2LEbslcRGu6BMH6gS?= =?utf-8?q?isvybueT6BqV9ql2Pa13mKp6Zn0sERMR+u34HsM2oT7chPdvtLgiGseO1/GkBBZUz?= =?utf-8?q?DKjnPlCNUzIFCM9K+oHanCiVx4NqgU8xZ0p0jyHsweC4FMJmfOMeNXPfQTMQ=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: 5mjCxTD1BsQ1ekBRnezaDlJmJPY4+MxldUGrszdu7A+3gs5No8o+STo5nZZaoRPlgDDWCKBObJuEx4idQK4frOwVuJpHTTc+it4ygdMC4ORi1wmEHjox+4jG0xc2B4LBL0uxM0bJH6lGtsHzQCfiko+puoooFD06GMj0/zpHWoulrcIfTzbnpk2DlBX7wXoD66sNdVRJ6mrZNwWa+FNSzXKhmbkhKkvjDHs5XxbKxpSPhA7pwSDg2Go42agfz7kqGh7YYJ1S2E74wz0g15unIz2C7f/6Jbu5kW4p8Z/jytpz4JtUoOv0vjFKzCwhVoCEZecM2j74wqSN3960LhJNvjKggmvBpy02mGJxWNCEZ3o= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 6:nmrSU6iMjAq14imJjNuZwBEfc1HOQrSH9Del7iuMvqoaDzz0YR1ccScI4NP2B0NidVZV0kK2uvZsng0LOLU3SrnjyUeva1xuZwc6D5qMFR1RaCv7xelg6F8sbrsPldOXqQg0i3ehOWpjwh2VRvwugFVilWj1GsY0p+lds4fbZhKb3WW2qhMn2/5il/Rd0PRwX0sYxmSdEBRqcULlj8rDUFRruXzcyNtTmsLIZQUhH2PTKtjlfGn5sYtw0MT41Px9hJiIxI6AaWVuUMiz0eeIyaNuhfbebgOMVvYdRCj8pyvjqLbde4XeRNqXZ2WOZW3c2TpjEl8bAzBOUKemNIGfVk+JVGm1sr4G2fzxuOCRjgAthQqqwgkbV1qcphDBVQ3UICBiw/PlGEwh9l2Ufk1iykkp+9/OCpW/qpHz2Fe74CpZIBxIplO2m+Llvsk4dp0/xQGivOD1j4Cq1pmggZnfCQ==; 5:e4nCfU0IB+5oE01Nfwz12qW29sht7Zu/JMxi62Z+cwBik5C4TgwWK4/QDUXsgIaxnZgUSeSwNvarJCBsU6Ut/fl8VEKuRXGjf5bTRHMrKO+FGMkYviMhgE7f06ZbubxmpYgimqzuDE6H2OiMQruo5mxqOXmCRvYDLsAxF7UUg0I=; 7:VZ5Mjh6MgzKzM4EklQzZEr1gZNJioaG0K7Tydvq9CXoMZgvtz4VrctVACwLgzPS7Y/q5bcScHOGhbQsQGRFdpYukLwl6rAb8k0XUL7eIXmlMChAASX+xuFzPs7xlMTXHlSlzRECrswjv2RyRo1uJvA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 20:zu1spxA09cSXNEuSxKNm8GWPTHF55ea2bP/i9WC8738Lb0cyIZC3ZFnpyZqgCyTNm34bV2s8iZ2m5iVIlF4TT/jeFJQ0D/ItAfg29gsZuJnpgsiONC1jMDx10uTiY9dLhZ2zWkk0q2vUtbCWrad/9EhVlH2Y2SZbZaFgwkXbTQaCfcD8W+yH93KUyv65UyBaoBdLGmYwRlgf3mVOgsOHKhItxniMJI9j9LbFTLwCF08NUE94cjwLkfm1S1mhl5mg X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:54:52.5821 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8499edc9-bff4-4f03-23ed-08d65c5c538d 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0059 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: =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Christian König Use the dma_fence_chain object to create a timeline of fence objects instead of just replacing the existing fence. v2: rebase and cleanup Signed-off-by: Christian König --- drivers/gpu/drm/drm_syncobj.c | 37 +++++++++++++++++++++++++++++++++++ include/drm/drm_syncobj.h | 5 +++++ 2 files changed, 42 insertions(+) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index e19525af0cce..51f798e2194f 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -122,6 +122,43 @@ static void drm_syncobj_remove_wait(struct drm_syncobj *syncobj, spin_unlock(&syncobj->lock); } +/** + * drm_syncobj_add_point - add new timeline point to the syncobj + * @syncobj: sync object to add timeline point do + * @chain: chain node to use to add the point + * @fence: fence to encapsulate in the chain node + * @point: sequence number to use for the point + * + * Add the chain node as new timeline point to the syncobj. + */ +void drm_syncobj_add_point(struct drm_syncobj *syncobj, + struct dma_fence_chain *chain, + struct dma_fence *fence, + uint64_t point) +{ + struct syncobj_wait_entry *cur, *tmp; + struct dma_fence *prev; + + dma_fence_get(fence); + + spin_lock(&syncobj->lock); + + prev = rcu_dereference_protected(syncobj->fence, + lockdep_is_held(&syncobj->lock)); + dma_fence_chain_init(chain, prev, fence, point); + rcu_assign_pointer(syncobj->fence, &chain->base); + + list_for_each_entry_safe(cur, tmp, &syncobj->cb_list, node) { + list_del_init(&cur->node); + syncobj_wait_syncobj_func(syncobj, cur); + } + spin_unlock(&syncobj->lock); + + /* Walk the chain once to trigger garbage collection */ + dma_fence_chain_for_each(prev, fence); +} +EXPORT_SYMBOL(drm_syncobj_add_point); + /** * drm_syncobj_replace_fence - replace fence in a sync object. * @syncobj: Sync object to replace fence in diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 7c6ed845c70d..8acb4ae4f311 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -27,6 +27,7 @@ #define __DRM_SYNCOBJ_H__ #include "linux/dma-fence.h" +#include "linux/dma-fence-chain.h" /** * struct drm_syncobj - sync object. @@ -110,6 +111,10 @@ drm_syncobj_fence_get(struct drm_syncobj *syncobj) struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, u32 handle); +void drm_syncobj_add_point(struct drm_syncobj *syncobj, + struct dma_fence_chain *chain, + struct dma_fence *fence, + uint64_t point); void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, struct dma_fence *fence); int drm_syncobj_find_fence(struct drm_file *file_private, From patchwork Fri Dec 7 15:54:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718407 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3B5C15A6 for ; Fri, 7 Dec 2018 15:55:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2E392DADC for ; Fri, 7 Dec 2018 15:55:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 954792E5FD; Fri, 7 Dec 2018 15:55:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90C522DADC for ; Fri, 7 Dec 2018 15:55:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CF146E7CF; Fri, 7 Dec 2018 15:55:07 +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-eopbgr680043.outbound.protection.outlook.com [40.107.68.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA5FB6E7CF; Fri, 7 Dec 2018 15:55:05 +0000 (UTC) Received: from CY4PR1201CA0017.namprd12.prod.outlook.com (2603:10b6:910:16::27) by CY1PR12MB0838.namprd12.prod.outlook.com (2a01:111:e400:59d2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.19; Fri, 7 Dec 2018 15:55:03 +0000 Received: from BY2NAM03FT022.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::201) by CY4PR1201CA0017.outlook.office365.com (2603:10b6:910:16::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.19 via Frontend Transport; Fri, 7 Dec 2018 15:55:03 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT022.mail.protection.outlook.com (10.152.84.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:55:02 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:55:01 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 04/10] drm/syncobj: add support for timeline point wait v8 Date: Fri, 7 Dec 2018 23:54:16 +0800 Message-ID: <20181207155422.15967-4-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207155422.15967-1-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@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)(39860400002)(136003)(396003)(376002)(346002)(2980300002)(428003)(189003)(199004)(77096007)(5820100001)(86362001)(8676002)(68736007)(53416004)(106466001)(50226002)(104016004)(478600001)(72206003)(105586002)(2616005)(6346003)(66574011)(186003)(7696005)(336012)(446003)(26005)(476003)(486006)(50466002)(426003)(11346002)(76176011)(126002)(5660300001)(4744004)(36756003)(47776003)(81166006)(23676004)(8936002)(1076002)(6666004)(305945005)(97736004)(81156014)(4326008)(316002)(110136005)(54906003)(14444005)(356004)(2201001)(2870700001)(2906002)(53936002)(21314003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0838; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT022; 1:5dkIlWOvJQ6TlKHDRADWnNYsNDqUZ54V4StU88zGUaEzQmOrDAKKCdgF2nxvtocRUntXO4G1sURdPAga0AcaUOeG3JIkVcdrotmLzf9tozUDsgaNTCNVI7Z1ppAlYX8Z X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ea0528a-9d31-429e-3bf1-08d65c5c59c8 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:CY1PR12MB0838; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0838; 3:lC9ppueFG0GzVXz3pIGC/DjHfMBPIWL6RqznFGwZbGvvR7VlTsE9n4lWYMQyIfmn5+d9SJjE8z3prlFS/LYVg0HFr/lMKHC6+7c+CsfpBc63rfCSHmStukhiW8gUPJx+4EEjRh+OCp5u32bMhUKAtaJom0bsC3uQd82ITDqJrCJJthLNtYwAYwO8fbSg0GlTBHVyTovYpOWZu6VuiRLXKmqorRvcS802MDXkPAEJbav8oUwN/VIodHbN7pr8oaF3K/Bf71IF74mFogy8VMCK1uxQGXKB1jgt2qrlF3QSuUSLaIls/jNn8go2SP+RFm4N0MWrmEMqfpliAx+CsTanX116VKKXzSPxNE+/RVYde/4=; 25:DzK+EDbptyNyTN/nvNMYbA32cZxMqt1Y518ND1PVIaASS9BqoDDL0wEzbo8S1MYeeVvhsunp+HZ/zdiJ0LTspTsa2x8qlfZyJTIErmAylzsSLEmpRUbM0vjCmvcMHeykcdxw1zyLZjxRSmxIP2IkjXQrBIYXDMP+/jsxCtwoAkMl29a2/xEgl9+qWKDmpNvl2NTd4ZoIOzoo+YnRO/ih/7pcbiKcjceT+BX/+8d8QWdS6oezhHQTABoh2HoDkyLd441rgZLlxUx7ghgQEDeOpnwkUwqF4D/lkqL+TStj0/HD/VjMjezZdDMGsqQYQm8mskxF9JWJSjmKZSv/qIawMg== X-MS-TrafficTypeDiagnostic: CY1PR12MB0838: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0838; 31:o2sAb3/tJ6sxTqge0fwADVh57hei8zMgCEVx1G3pOLsPXdXhwXX5nub/rdgHOlPE0NM9DmvPNyAaZ+SULJ0J2U8eQcwgwBlUq9sxqLLqydx1CWAw+7SELMX6rouM7VQYjToe2MA+sW8uMYZSecf7PreHpQrMNSWFyIDdz45lO/7+70GzDK1WPS8HTEfuGOhwJe21Tih6qM4YUtHJ14WILAMyrKlSh/Ob3rMlto0MK+c=; 20:zEiJ6MBqDqpdoeaZfDT0KRfctnIrxR46W/PVZBKlydupl4a2CbkHphdRKy7U4Qay1tt1uph+8wkU6eh86H8QxeqVjtBRWdKagNUnVjiBFU2mLE9dfHAAH7rWhf66KLqo1mdkDx1rxMesWK5RCye37XG/D9SdUJZ5FCj7y7er8KQEKMpF3a3/cDF5MdusPa+3VX2dcN7457+gjQsjfJgDQMiDwe1UADREg1LgWYKnl2vEJsClWk1uqPPTqNu5wOAcpwsgjjz9tE8WJFTGjxUcqXKq2HFW2brexF9WwE3UU/b2F7MYkPC4R+6VTiaqlb6qegJbulyUfUlPhFS8+wx/X7DCumPjFFLIaBcJlAlN7pqEZRG8pBenx+zmgUUN+p2N2kaCGWsp+qSo7ErdLy4sHXcd1BFrC1NN+JrZtFhjarimVcVBpCmZodQL2ZF3SswNNqWxLJ1RjFu4PUwQj7T0P9vEIlhb5hW8B6ShqCIQtPu9uWIxs+Hb75gzfFaqVod6 X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93003095)(3002001)(3231455)(999002)(944501520)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:CY1PR12MB0838; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0838; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0838; 4:Yy9Qy7tAyrYoD0cYcegjtfegdGRqeG6nPV+GRG6mNw6U9DqHoGgwPyPYZWiRLfPoDQk2gDjltfbXeXyfptTr9YzeZbYtdhuFCNv258MO/A6SudFzQ/CK3DTv6szwbA4kr+E5UrYEyeFBQQ3P3ZqL6FTCIdQRM5mFxgifxhdNdxy7DwtvtKykRWDYz54eZ8wvPECXJUMSlN/unXE+u1O8J+7m47WGhQa/WDdkoDn9A6BYvsyfy9Kd0QrOtr2QUoCWqrUsEIY/3ZsfjQhcRnIunQ== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BCY1PR12MB0838=3B23=3ANJBJp24?= =?utf-8?q?GEKy+h956lgnKmobaU10DHXbp/xqioM5IZfQ2LZoCA9kS7H/fkH3UBK2bL+FEnNEM?= =?utf-8?q?CVKqIcyeDi8jKd/xs+wwhabOtFnrawzKyP9tgWyLo/CNpMRdVKMGYMpe+NrcAJrCx?= =?utf-8?q?tBOtjpdRtfLYw6K9v/fjxgwulWwCTdgST7G2cZRlBJW1gmMocTnUIx/F421yi0jF3?= =?utf-8?q?sLbSVMb2lnrD2gakLb3rXqcRC6hkH6XXf/34EaIzZli1Y+8ZxSMyEyzLz+q5LCF2C?= =?utf-8?q?qWIu+471Aj57odWEOiNibBu6EeFwk7up+SzGCt5EuixKqv9bTGpc8wezLfFraggX5?= =?utf-8?q?USpw7dFQT5fJqS/6Q3LQKV39iJGffv0auNE9ynLDjhkLFcjDtF+RmFzjrAZC25UgP?= =?utf-8?q?s5esxgi5Oo4BtaE4iZdn8HlhRsexEx7+7aSPdCRXVAhSUkF/gJQ0BHL7orUtHVBtg?= =?utf-8?q?8+/1MTHO4S/Cq8J5SAD2DhnCyp+pnwfNrJgcCZaCzbU49QeqQOsdvG3MZi1mJT8v4?= =?utf-8?q?q9WBFkG26jo3tOztQI0dielI8sY+R2nQ7vA8Mc8VNb6wSCrx+Q1lgfITUK1Ufe/sA?= =?utf-8?q?dMJzhyoVqRMf8l2qAjeasCKDqbp65YldrN6lTVj/5E1DXNcrnWMf/nqc5o9Vucb9Y?= =?utf-8?q?3scGKsvMHPTs/JZ0Jqif4U9kENE7qR8do6b+4a231s3sJ3/zqNQ/uc3MwOnTRWU6B?= =?utf-8?q?CXtzrRUa6hgvVALy5mqlPV0Y3kIbiggy9DXVGKbRUztpnk8cIRecFwFwfCaDlJFCD?= =?utf-8?q?+uQzRPD+DeWfd1PIzhq/RyFLgdmHNsBZkVqjnU14uyEWmKnf0uUpcKC2hgxazSTT0?= =?utf-8?q?MpFWiUiioJGzlH8n/fEGvrZfadvc/cln3n1/AgD0rV1xjrwZ8sDLtrHhHiHjvkHq5?= =?utf-8?q?o1olD3LFIx78+EGpXObgucKQryz3r10pumJDXV9Xx4Q+/EFFw5WejJlpSXRvbQJ5D?= =?utf-8?q?2THpuI9oMXugYXl7MH2NpCGQSpK7tZIOtbeF/hMglfURb9ee2alexZCfrmK1hjaZS?= =?utf-8?q?tuuJOsFfSfNHEfjgiFjMvcPhDr9JJXztRV9a0TQT2JvwR+mDRggcovpsz/yLxvv5T?= =?utf-8?q?akkP3lh36J7j+DDtb7ywEgBQPYDPUO1oP2f0bVW53+WwPwReJSCz2RnScJpk06wxk?= =?utf-8?q?1SnOUI6dj/7Q3IgOW1As/0Y7jid21w9TFdqH6OMDnx6IIyGaRE3EnlmS/JX4rsspN?= =?utf-8?q?bjA6Rf9xEnfrN7l0+tbZn5X/0ajxBGyGiIRSGqR24+3r3HNBqvXskETnwwMiMsocj?= =?utf-8?q?AWPjf1KSTpUuJFK8=3D?= X-Microsoft-Antispam-Message-Info: 7wC+jhWvGm1gu58PTyOL8ukQkmTp7TCeqYYxSUxquik2hm/DJfxlCnEBmnyXjDnKEhQwCYtpShH6E6BEUWKRVawinz3w/RG/w71SHmO3DTNjYOZI0hvZLaRkye9mQX2sXFQVZxyyeBZTD1EvhulbClgQaBcOznp2UDz9k1nGnYVKcuszTQmb7loK9Rou2aMy9VLiGtF4H1YyT1Lf4RtCnmdKk20OoBkJRTUIrnm+Y5IfoV3919H21AiqwdwqnDknGIq/w4EMz5YlWlHutNP2c4UZuIl0yi1URyiSgy98BNsfq+55AzNPoj3qtE5FXcpdisflt4XCfJR5PrXsYs2rZ2Tuxxqv07SagszILxxjlKQ= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0838; 6:SsZYlKXqtnksJIJWquWMXg7pJtvai3TNs3vkCSIQQlJgw4iPsW5YIgCzgHc+njCAmYAXKKGsh6sHrQB/YOunxqU80w24QRnnHYYOd1ufYSGtpd3fgw+gmn44XKH4lV/9/SQLEAFdXbkp4/GlhqFECVdvlTwJYmDLulzAwJcf4fKR1fNiGRze0tuP5u5pGZ5j9U9pN/AcsV9See1mAxKSXMQ/ZImhWcGkCUX0zop2xUfTs6xQFXXtPXzBzXuu0g2jDEJDf+EJrB+H6HsgYSWhPC2oKBqvT6q0A4Ss3JhpgSZVzJ+7hfG99NxEoy1h+cIhfP6iihT8iK/F/SVGQvQyo8VDFCzca9cTHvyv6IgFQeo2CvN1OtUd3E7VBJyMjuKLrq6le4BBaiV5x5THXMAjeEbj5q7lJHwnu6wtUHURVlfm7LReLHwTRM3mPYnoT0DIExzRDqHtk7sw+3yBzn3j4g==; 5:ejbsrVNRtz021StAcz+QUqzIVJasgN9I5hMWvvVR3pXWxw3dnda7luJnUAS4XR6yIt8JP8GachGSw3ThjSfIKiXsG7Z5vxr4rPONNa2YcDa1fBqvFnangv3NJOhwTG5wAGe/qUbvMoF21ieKaTDQ/f/2sbdhOcSHsg8xpw3+0jI=; 7:hkRhfRP/QCncFfXwNZpYqD4Sv6Lg7yVnpART2DigGqbJbNHEgC7JB/eUwr/E2CGUym93bHYeKJzPjJjm6FHvabYXFS4ipNfjdaboE7QBar8r+AUTFw8AJalupeaJWKy9hhMr1Y5J0DUIApj74mVxCA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0838; 20:X1MmPS0CdC74DdcGzIll/VgeQ81qUn+NHgjpEjSR5utkBA561SiCIOnqTCvK22P3h4LSKr1XHmHVyrGvUCY9H7E08+eGtnmvTF8++nUHpu4uhighXdEs/VMjQoXH2FEY3JZSCxgju14dbH+Be+uCBZZdXFIXYaD2iza6BD8tbdQd+c7hI3zxhQwvfCse04Sr3XYFvZ+2DvVlWSKc8bc6QWnpFIM4ERaz5r0VWwRRCDMQcIXcNgERoLqW5JwDorGV X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:55:02.9889 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ea0528a-9d31-429e-3bf1-08d65c5c59c8 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0838 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: Daniel Rakos , Jason Ekstrand , Dave Airlie , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP points array is one-to-one match with syncobjs array. v2: add seperate ioctl for timeline point wait, otherwise break uapi. v3: userspace can specify two kinds waits:: a. Wait for time point to be completed. b. and wait for time point to become available v4: rebase v5: add comment for xxx_WAIT_AVAILABLE v6: rebase and rework on new container v7: drop _WAIT_COMPLETED, it is the default anyway v8: correctly handle garbage collected fences Signed-off-by: Chunming Zhou Signed-off-by: Christian König Cc: Daniel Rakos Cc: Jason Ekstrand Cc: Bas Nieuwenhuizen Cc: Dave Airlie Cc: Chris Wilson --- drivers/gpu/drm/drm_internal.h | 2 + drivers/gpu/drm/drm_ioctl.c | 2 + drivers/gpu/drm/drm_syncobj.c | 153 ++++++++++++++++++++++++++------- include/uapi/drm/drm.h | 15 ++++ 4 files changed, 143 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index c7a7d7ce5d1c..18b41e10195c 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -178,6 +178,8 @@ int drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); int drm_syncobj_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); +int drm_syncobj_timeline_wait_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private); int drm_syncobj_reset_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); int drm_syncobj_signal_ioctl(struct drm_device *dev, void *data, diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 94bd872d56c4..a9a17ed35cc4 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -675,6 +675,8 @@ static const struct drm_ioctl_desc drm_ioctls[] = { DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_WAIT, drm_syncobj_wait_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT, drm_syncobj_timeline_wait_ioctl, + DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_RESET, drm_syncobj_reset_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_SIGNAL, drm_syncobj_signal_ioctl, diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 51f798e2194f..348079bb0965 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -61,6 +61,7 @@ struct syncobj_wait_entry { struct task_struct *task; struct dma_fence *fence; struct dma_fence_cb fence_cb; + u64 point; }; static void syncobj_wait_syncobj_func(struct drm_syncobj *syncobj, @@ -95,6 +96,8 @@ EXPORT_SYMBOL(drm_syncobj_find); static void drm_syncobj_fence_add_wait(struct drm_syncobj *syncobj, struct syncobj_wait_entry *wait) { + struct dma_fence *fence; + if (wait->fence) return; @@ -103,11 +106,15 @@ static void drm_syncobj_fence_add_wait(struct drm_syncobj *syncobj, * have the lock, try one more time just to be sure we don't add a * callback when a fence has already been set. */ - if (syncobj->fence) - wait->fence = dma_fence_get( - rcu_dereference_protected(syncobj->fence, 1)); - else + fence = dma_fence_get(rcu_dereference_protected(syncobj->fence, 1)); + if (!fence || dma_fence_chain_find_seqno(&fence, wait->point)) { + dma_fence_put(fence); list_add_tail(&wait->node, &syncobj->cb_list); + } else if (!fence) { + wait->fence = dma_fence_get_stub(); + } else { + wait->fence = fence; + } spin_unlock(&syncobj->lock); } @@ -148,10 +155,8 @@ void drm_syncobj_add_point(struct drm_syncobj *syncobj, dma_fence_chain_init(chain, prev, fence, point); rcu_assign_pointer(syncobj->fence, &chain->base); - list_for_each_entry_safe(cur, tmp, &syncobj->cb_list, node) { - list_del_init(&cur->node); + list_for_each_entry_safe(cur, tmp, &syncobj->cb_list, node) syncobj_wait_syncobj_func(syncobj, cur); - } spin_unlock(&syncobj->lock); /* Walk the chain once to trigger garbage collection */ @@ -182,10 +187,8 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, rcu_assign_pointer(syncobj->fence, fence); if (fence != old_fence) { - list_for_each_entry_safe(cur, tmp, &syncobj->cb_list, node) { - list_del_init(&cur->node); + list_for_each_entry_safe(cur, tmp, &syncobj->cb_list, node) syncobj_wait_syncobj_func(syncobj, cur); - } } spin_unlock(&syncobj->lock); @@ -642,13 +645,27 @@ static void syncobj_wait_fence_func(struct dma_fence *fence, static void syncobj_wait_syncobj_func(struct drm_syncobj *syncobj, struct syncobj_wait_entry *wait) { + struct dma_fence *fence; + /* This happens inside the syncobj lock */ - wait->fence = dma_fence_get(rcu_dereference_protected(syncobj->fence, - lockdep_is_held(&syncobj->lock))); + fence = rcu_dereference_protected(syncobj->fence, + lockdep_is_held(&syncobj->lock)); + dma_fence_get(fence); + if (!fence || dma_fence_chain_find_seqno(&fence, wait->point)) { + dma_fence_put(fence); + return; + } else if (!fence) { + wait->fence = dma_fence_get_stub(); + } else { + wait->fence = fence; + } + wake_up_process(wait->task); + list_del_init(&wait->node); } static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, + void __user *user_points, uint32_t count, uint32_t flags, signed long timeout, @@ -656,12 +673,27 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, { struct syncobj_wait_entry *entries; struct dma_fence *fence; + uint64_t *points; uint32_t signaled_count, i; - entries = kcalloc(count, sizeof(*entries), GFP_KERNEL); - if (!entries) + points = kmalloc_array(count, sizeof(*points), GFP_KERNEL); + if (points == NULL) return -ENOMEM; + if (!user_points) { + memset(points, 0, count * sizeof(uint64_t)); + + } else if (copy_from_user(points, user_points, + sizeof(uint64_t) * count)) { + timeout = -EFAULT; + goto err_free_points; + } + + entries = kcalloc(count, sizeof(*entries), GFP_KERNEL); + if (!entries) { + timeout = -ENOMEM; + goto err_free_points; + } /* Walk the list of sync objects and initialize entries. We do * this up-front so that we can properly return -EINVAL if there is * a syncobj with a missing fence and then never have the chance of @@ -669,9 +701,13 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, */ signaled_count = 0; for (i = 0; i < count; ++i) { + struct dma_fence *fence; + entries[i].task = current; - entries[i].fence = drm_syncobj_fence_get(syncobjs[i]); - if (!entries[i].fence) { + entries[i].point = points[i]; + fence = drm_syncobj_fence_get(syncobjs[i]); + if (!fence || dma_fence_chain_find_seqno(&fence, points[i])) { + dma_fence_put(fence); if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) { continue; } else { @@ -680,7 +716,13 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, } } - if (dma_fence_is_signaled(entries[i].fence)) { + if (fence) + entries[i].fence = fence; + else + entries[i].fence = dma_fence_get_stub(); + + if ((flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE) || + dma_fence_is_signaled(entries[i].fence)) { if (signaled_count == 0 && idx) *idx = i; signaled_count++; @@ -713,7 +755,8 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, if (!fence) continue; - if (dma_fence_is_signaled(fence) || + if ((flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE) || + dma_fence_is_signaled(fence) || (!entries[i].fence_cb.func && dma_fence_add_callback(fence, &entries[i].fence_cb, @@ -758,6 +801,9 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, } kfree(entries); +err_free_points: + kfree(points); + return timeout; } @@ -796,19 +842,33 @@ static signed long drm_timeout_abs_to_jiffies(int64_t timeout_nsec) static int drm_syncobj_array_wait(struct drm_device *dev, struct drm_file *file_private, struct drm_syncobj_wait *wait, - struct drm_syncobj **syncobjs) + struct drm_syncobj_timeline_wait *timeline_wait, + struct drm_syncobj **syncobjs, bool timeline) { - signed long timeout = drm_timeout_abs_to_jiffies(wait->timeout_nsec); + signed long timeout = 0; uint32_t first = ~0; - timeout = drm_syncobj_array_wait_timeout(syncobjs, - wait->count_handles, - wait->flags, - timeout, &first); - if (timeout < 0) - return timeout; - - wait->first_signaled = first; + if (!timeline) { + timeout = drm_timeout_abs_to_jiffies(wait->timeout_nsec); + timeout = drm_syncobj_array_wait_timeout(syncobjs, + NULL, + wait->count_handles, + wait->flags, + timeout, &first); + if (timeout < 0) + return timeout; + wait->first_signaled = first; + } else { + timeout = drm_timeout_abs_to_jiffies(timeline_wait->timeout_nsec); + timeout = drm_syncobj_array_wait_timeout(syncobjs, + u64_to_user_ptr(timeline_wait->points), + timeline_wait->count_handles, + timeline_wait->flags, + timeout, &first); + if (timeout < 0) + return timeout; + timeline_wait->first_signaled = first; + } return 0; } @@ -894,13 +954,48 @@ drm_syncobj_wait_ioctl(struct drm_device *dev, void *data, return ret; ret = drm_syncobj_array_wait(dev, file_private, - args, syncobjs); + args, NULL, syncobjs, false); drm_syncobj_array_free(syncobjs, args->count_handles); return ret; } +int +drm_syncobj_timeline_wait_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private) +{ + struct drm_syncobj_timeline_wait *args = data; + struct drm_syncobj **syncobjs; + int ret = 0; + + if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) + return -ENODEV; + + if (args->flags & ~(DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT | + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE)) + return -EINVAL; + + if (args->count_handles == 0) + return -EINVAL; + + ret = drm_syncobj_array_find(file_private, + u64_to_user_ptr(args->handles), + args->count_handles, + &syncobjs); + if (ret < 0) + return ret; + + ret = drm_syncobj_array_wait(dev, file_private, + NULL, args, syncobjs, true); + + drm_syncobj_array_free(syncobjs, args->count_handles); + + return ret; +} + + int drm_syncobj_reset_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 300f336633f2..0092111d002c 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -737,6 +737,7 @@ struct drm_syncobj_handle { #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0) #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1) +#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 2) struct drm_syncobj_wait { __u64 handles; /* absolute timeout */ @@ -747,6 +748,19 @@ struct drm_syncobj_wait { __u32 pad; }; +struct drm_syncobj_timeline_wait { + __u64 handles; + /* wait on specific timeline point for every handles*/ + __u64 points; + /* absolute timeout */ + __s64 timeout_nsec; + __u32 count_handles; + __u32 flags; + __u32 first_signaled; /* only valid when not waiting all */ + __u32 pad; +}; + + struct drm_syncobj_array { __u64 handles; __u32 count_handles; @@ -909,6 +923,7 @@ extern "C" { #define DRM_IOCTL_MODE_GET_LEASE DRM_IOWR(0xC8, struct drm_mode_get_lease) #define DRM_IOCTL_MODE_REVOKE_LEASE DRM_IOWR(0xC9, struct drm_mode_revoke_lease) +#define DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT DRM_IOWR(0xCA, struct drm_syncobj_timeline_wait) /** * Device specific ioctls should only be in their respective headers * The device specific ioctl range is from 0x40 to 0x9f. From patchwork Fri Dec 7 15:54:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D3DAC15A6 for ; Fri, 7 Dec 2018 15:55:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C41AD2DADC for ; Fri, 7 Dec 2018 15:55:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7DA82E5F6; Fri, 7 Dec 2018 15:55:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5B4992DADC for ; Fri, 7 Dec 2018 15:55:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C85E6E7D5; Fri, 7 Dec 2018 15:55:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::60d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 75DBC6E7C7; Fri, 7 Dec 2018 15:55:17 +0000 (UTC) Received: from CY4PR1201CA0004.namprd12.prod.outlook.com (2603:10b6:910:16::14) by CY1PR12MB0059.namprd12.prod.outlook.com (2a01:111:e400:4c2a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1382.22; Fri, 7 Dec 2018 15:55:14 +0000 Received: from BY2NAM03FT059.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::206) by CY4PR1201CA0004.outlook.office365.com (2603:10b6:910:16::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.19 via Frontend Transport; Fri, 7 Dec 2018 15:55:14 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT059.mail.protection.outlook.com (10.152.85.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:55:13 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:55:11 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 05/10] drm/syncobj: add timeline payload query ioctl v4 Date: Fri, 7 Dec 2018 23:54:17 +0800 Message-ID: <20181207155422.15967-5-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207155422.15967-1-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@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)(376002)(39860400002)(396003)(136003)(346002)(2980300002)(428003)(189003)(199004)(4326008)(47776003)(316002)(2870700001)(77096007)(86362001)(50226002)(5820100001)(68736007)(305945005)(76176011)(14444005)(8936002)(104016004)(53416004)(486006)(2201001)(5660300001)(81166006)(126002)(106466001)(54906003)(110136005)(81156014)(2906002)(356004)(426003)(2616005)(336012)(50466002)(11346002)(186003)(23676004)(36756003)(446003)(8676002)(7696005)(26005)(478600001)(476003)(105586002)(1076002)(72206003)(97736004)(53936002)(66574011); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0059; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT059; 1:RHTN+qXK+yi2TPUAuICgdcS3V2xMlM0ugEoC4kOiiKZiP4izPFSw+WHdLI5ZDb1YccqRgJTAmQPoiRsvme2bFwsMOaRdR++GgL85TCPZE4O88ybMlZy76qt7VuxFDqGC X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 367db1a4-d59b-4ea4-b34d-08d65c5c6007 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:CY1PR12MB0059; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 3:Dbh7HEBZvyCDvPtLgVzefm+CpVS7YELXPznZFi8Cy8uyho4rr55wK9v6y2NhGVvsQQCAv64Gfu8Wii508Ua618ch/7a0jwrgYNuwVtK/SsoX+pKIai3AUQT6vbbjPTWHNHalB04r1zt2xmDof34LB3wIZQJjFe7sabo6fA/j4rXFsK6i2owest+bqHvmKQcHsqadyJ1CjGPSGMrvp+nbHWIzY+1sOeBDukVvZBTnSlfbPMW8iJyDTYHc1vYhLynnbCsHJJjdLevQOQcjEEtw9OrWr4LKJttHYGUvWmWuq77WZRW6Q/qj4d0UfEXwT/y4lKrx8ZStzPnGRI9kqIP4exzkE40eJEzLIMgCXg90fRE=; 25:sHhYEdVUt+bkGq3X7E7ASEBnOORfUV47lLpeYmuZPJmMoOo0wXEsUH6hrrwCMBnRkHuX3w3iQP5ZPgQHYguPDV72ZZ3s80nQzd7KKgCkJ+1Oo1FaYRwuKlokSzIzOClQwesapGnGNkFQj3QPc6IVniq4nIMQP0lZpdWhUu3qpnhqK8lCBaI4iZey0BeJwABnKhU1ojbZOvKEPxrJvk3KKNCZl45FjAWEOpi1TEfKD4BYHzh7ENwoFAcuwrMCLkKzWlMUr4xT/eu+jlC6ZMzgTJUZgPtkinITddZ8zSy18GF76xZPl/3IJHjDU7Qpc31mcDEVzvBW0MfXgNxPT6QA3A== X-MS-TrafficTypeDiagnostic: CY1PR12MB0059: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 31:gfqbkKYkeZb9exuRpErLBtjBWWHn32wz+nIxRW/ICK9OIZABfhHQ2AIQzMK7nnhhLNW9wm+UDlAkE3UHHTA7TU08DGId4chdAI5Lgk87EtDhluzWs/Uk0ywkKww4oZF1FwWj0wslHgp9Hb8PT5/XdxjuHy3AgdWWIkuRtFn1tMO7Eh6xKcYqnhFLWzB5noumfpXCb6ouM3tNPw+rVARqdLX4uC5fY0fg5G63a3Ur8bM=; 20:KakpG7kjFsiiyGQGr0VebUOhTpX24dGYrqEAsm/YQPkNf6kHrjuh42JInUm6IOcVwe7ukv5krcy6gCuHBvD49KQVubJNUV+K7rYvN0SCz9pb4cOChnEAduUwYT9JgBAAj7jD4ZxdiNJqk3Gi1zasQuVnHO8JI+1Pk8MbjBQL/v4TSxxuKY4QMt6y4PILjIS9csJ/WVyMwWhQDDck160yFBGXjCMVWpgkDi/2th+s/Ap7HApnrEmIjYWicPDKgy73ibZ596dNoY7h/FiShgu5R+zgjaPOD2n5RxddOUObcX09CvSxFT2g6v4Ctvii8oKJhQ13UePiFsxLxs0cTwZYKcQ4BQjnGLkT9gWLpGE/iXYhJNohJP/JaoxuMmDiX4Qv0qyBs+rgXGKrRfypsFyFsB0FKjqg2mmC4gyeuSrQ/u501dQLIsT5Aq5E3byO+nmyRyGGHIs9du60PQy/GQhqPu1bJrTL5OL+8Q1zC4P2TvOCTSLg0osHraSuHH+qdeXR X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93003095)(3231455)(999002)(944501520)(52105112)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:CY1PR12MB0059; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0059; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 4:UWtOElKJ9+VPBHuosCby+eHmWCgysTmqg3ejF8UHHRVQ3CyzWbxq82IQBMPH9dbaf3d9SeBWjPKsEjH/GtYsGgOu5oXMjt6ulWsQhcth4iSRIKoYzv4mLj0sEnq5/Nc+VHGpkk+eZAja1It6ygb9J+i7L3xuFd5SwApC1NFrOC2FcBLxFwgd41ufS8AzKLF8z8fKIoCkF89/9zZDlE8+K9JvRQHmhJfiAb7sD1f3jEHDFxsX0765JVUwbqIPVb6JKJ+Ynzk0FiEcdywXBX6mVg== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BCY1PR12MB0059=3B23=3ALlGp7XN?= =?utf-8?q?9ndTMTtETGYNuLtzQcQmf3h2Fq5AjKbDCOrFoEQ4/An3XPRD20pecArGp0Y3EpA9t?= =?utf-8?q?kxSfpNrEiRcWw7KIF3gms7EHUSKLZBtwlNUgUxyhuD/0Y95hpVx4/C+Yppr1JpB0T?= =?utf-8?q?txJJiGJLhVtnfF5/tnsgKdp0my7WwvzwyT1GHL6KzUlb2IqweY4DkBLPkEH0GDX6O?= =?utf-8?q?cIf9F/0I9iSdU6YVEGZlssvvOBJLqy/0nwxzESVD9tMM6vuU4VoRZnlgg2byd4Paj?= =?utf-8?q?UMkV2FWaG0sxMmfYd1r9Ubrvf8DBvYsoH6pbzELhzX9J1tqHq3ArAmlaWnSzcHvYG?= =?utf-8?q?mZVwOQpyVtBWFJQLIWRxjPi3mXkeDjuu5W0L05hmDk/YVtHnbsrGM9DII3hwhzJSP?= =?utf-8?q?PHVGTTWVNSMxUGWwhrnmUTBJbEBqJ/T1w65UkyJ2aafekCIwYT21UXOr09U/vxAAP?= =?utf-8?q?FdB+raKTENyX2ikZi0+qTsSAzG6f0NuPr0V24sAqtNdMcc5skxpIBmXaf0BOTDSsc?= =?utf-8?q?JfRSyLp5gtFZHtLJI4c7cGmYsCyzAZzjiKIwvc5OLQ9Q2lEBFZx7ZMRVxBfxOgY6p?= =?utf-8?q?DRb/T39J+ddYBpTUj+bk28q8gKpzdko25xBYm+VYM3/mIBGTDUCcZxXD1Q5dR7ROF?= =?utf-8?q?68vfXPQ+S9LC9dEzUj5HoY9OUK5lGy9QK0hROH/V65Y/wH4+Dwh2+QQXKg0RMvpZ3?= =?utf-8?q?rVThIFX8tPzTrCZkAMMkisqXSNz8dQKWGUkwOtVc86geL6MIKE6jKe1iShWdo+c8/?= =?utf-8?q?WhyMoQPZxygc/lwoI4ZUydlydI/PH6yQk1ufrARPT34fvDOdgvjEcP+igkLw4Whse?= =?utf-8?q?e8NWoTH9yrSGwYjOI1HzBr20hjhGCCACx7bsX0NgQGUpAG3FNtVJ16/ajqmXOr8Bp?= =?utf-8?q?GqKuzIml3I6jKkqP72g/dboID6LDqhpPbJCdVEwp/okyE4qz/5LGmbMM9LBsm28sm?= =?utf-8?q?8GZOGO/gGhJEXPxjgaiVQnNCF3Kxe5tiC/9jcZbyevE7HAGZwjmZNALZ7IIuiWzAG?= =?utf-8?q?nYY5jrIZH0xeqz8RNV2z4JvgYg1uy6dbIrJX2sOrv9OB4GB4mfbDfTcV3C0iEQRlW?= =?utf-8?q?E08VTHFQdunryswjgd8u0lR/ArPGSltA85PrpcK7/wQ067RdzgjfdlG0LcwZRqIyC?= =?utf-8?q?ZLzc1VDjeoctg16Jq4RbeCB1Kx2eShVwEApOfYqm5ifzST1glftcmzuDMXabA=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: ijPH2PaAakO+K8UUtRu2AdyxvH4zHvKGqP7adgKAEXCc1BLZoVo34AlvgnQeyooZtDd9a1T8zhHYz8qUXFJxHC5Mykt+Zy1jDo5qPFFvJGUO3AgQUurdzRcOxlVyMGJWJyqY6fJQcrG7d/m8UpAL4QsWNtkndD4Rh5XZ58aECOYoPGvO4/IkGOODmaETyEnoNUpCrgy+1jDb+3DG54YrNdrFdArM5VLlokyEnHtuz+r4zF/RzarT3DvijmKe3Qwg5kONZx6DmpXRKXilZ7TouY1I6/HoHxiUFFIvSRNGi1pljkZqAohQFB10RZJCJ/7X6ma053eYogdCUZVWlvOzPb2ewhYiCzESO82C9b/+GtY= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 6:bISM3grLsUCs+W/fTf81TrKRo9E7IkhFSDaj6o33hopbsBfuMPpH+ZcNYOBU7TTV0vj4TG3OJ+5JIX0AjTm+2wQQDk9AaUsFHkpkKEkUZHKKUaE+dA7QDlvZo68OA+U105FENno5welqtGSi3XnsFChnLR7SzHbkvs/ZpzTb9yYVyqX4MAd/rYLfmz2bFdQnfuA2+Bzi23P1/KgsQ4rmgoBnbzBYYDMmetmCoCWsjEzoXwAIKp8qPZgs0u1AgXioWD5a2UAenBLpCw8XEd9OARCY9FiODkdeVTB7vMkt2VEivKgLlKVz7Ci8XW41FaWunmuwl8X/vJ4G8ALQFvvsT35l/LSgAaqoy6wZh8FmWQ80OpDOWJ0VZUJbl7NtGmZv8ePEFFcFZ7NgwvI5i5/grnA88CTtK8gXsVgG6YsmE4oeVQ4ZpEZm2UkPHyNEed+HqscNxYD3BWQo5T/DK3AuPA==; 5:DtPH34Cx/1AyLEgsWeo9kVespvk4fJ2KYI5JWL6rYYDzi4A9ADM7Yg2sAvv7RYlg5Bla9zi8W4b5nwW208IQksxVyEgXCIcwBI4dqEImKi+vjYQTyqEdhYYPkbFNbDsA+QCkMJ2/gLkXbosKsYuKswu4zp2Z5jeOAYkOluV9ZfQ=; 7:jqWiFJzjXbsihVgYZmym4X0WF0HLd6sHFED4FhjRj/3m98xPxyCPpH65EUpRvcWN++3V5u/lAnriW/s8jG1X4JZJEf3/ocpkQoTPzZFArjWTggFp2FR7LMUqiVOlQwp98RnvYKYA2XmHimlzyO0ctQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0059; 20:eIfN3BuHUTyAEPLblG1wZy61h3jZItcxyEPu0x1nY51/LkB5XDBXZV+YK6Vq/R3zLGOxnSRcxvvQYaq/Moi8K+4zt/gZmXgyyE6AjD8sUGry3jSXrozoty03iAeAuH4WRTgN05KmIEFiyymCrriW+xPc+mOhfq+xyIlK0xNWtUZusUnzRB66bqcr4MbPq/+YvM7SiJToHM0tHGovisiea8DhJkJNuoKiw++pYYsognK8bItrTqkdsFLYnjYbzFif X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:55:13.5492 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 367db1a4-d59b-4ea4-b34d-08d65c5c6007 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0059 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: Daniel Rakos , Jason Ekstrand , Dave Airlie , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP user mode can query timeline payload. v2: check return value of copy_to_user v3: handle querying entry by entry v4: rebase on new chain container, simplify interface Signed-off-by: Chunming Zhou Cc: Daniel Rakos Cc: Jason Ekstrand Cc: Bas Nieuwenhuizen Cc: Dave Airlie Cc: Christian König Cc: Chris Wilson --- drivers/gpu/drm/drm_internal.h | 2 ++ drivers/gpu/drm/drm_ioctl.c | 2 ++ drivers/gpu/drm/drm_syncobj.c | 43 ++++++++++++++++++++++++++++++++++ include/uapi/drm/drm.h | 10 ++++++++ 4 files changed, 57 insertions(+) diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 18b41e10195c..dab4d5936441 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -184,6 +184,8 @@ int drm_syncobj_reset_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); int drm_syncobj_signal_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); +int drm_syncobj_query_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private); /* drm_framebuffer.c */ void drm_framebuffer_print_info(struct drm_printer *p, unsigned int indent, diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index a9a17ed35cc4..7578ef6dc1d1 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -681,6 +681,8 @@ static const struct drm_ioctl_desc drm_ioctls[] = { DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_SIGNAL, drm_syncobj_signal_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_QUERY, drm_syncobj_query_ioctl, + DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_CRTC_GET_SEQUENCE, drm_crtc_get_sequence_ioctl, DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_CRTC_QUEUE_SEQUENCE, drm_crtc_queue_sequence_ioctl, DRM_UNLOCKED), DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_LEASE, drm_mode_create_lease_ioctl, DRM_MASTER|DRM_UNLOCKED), diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 348079bb0965..f97fa00ca1d0 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -1061,3 +1061,46 @@ drm_syncobj_signal_ioctl(struct drm_device *dev, void *data, return ret; } + +int drm_syncobj_query_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private) +{ + struct drm_syncobj_timeline_array *args = data; + struct drm_syncobj **syncobjs; + uint64_t __user *points = u64_to_user_ptr(args->points); + uint32_t i; + int ret; + + if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) + return -ENODEV; + + if (args->pad != 0) + return -EINVAL; + + if (args->count_handles == 0) + return -EINVAL; + + ret = drm_syncobj_array_find(file_private, + u64_to_user_ptr(args->handles), + args->count_handles, + &syncobjs); + if (ret < 0) + return ret; + + for (i = 0; i < args->count_handles; i++) { + struct dma_fence_chain *chain; + struct dma_fence *fence; + uint64_t point; + + fence = drm_syncobj_fence_get(syncobjs[i]); + chain = to_dma_fence_chain(fence); + point = chain ? fence->seqno : 0; + ret = copy_to_user(&points[i], &point, sizeof(uint64_t)); + ret = ret ? -EFAULT : 0; + if (ret) + break; + } + drm_syncobj_array_free(syncobjs, args->count_handles); + + return ret; +} diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 0092111d002c..b2c36f2b2599 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -767,6 +767,14 @@ struct drm_syncobj_array { __u32 pad; }; +struct drm_syncobj_timeline_array { + __u64 handles; + __u64 points; + __u32 count_handles; + __u32 pad; +}; + + /* Query current scanout sequence number */ struct drm_crtc_get_sequence { __u32 crtc_id; /* requested crtc_id */ @@ -924,6 +932,8 @@ extern "C" { #define DRM_IOCTL_MODE_REVOKE_LEASE DRM_IOWR(0xC9, struct drm_mode_revoke_lease) #define DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT DRM_IOWR(0xCA, struct drm_syncobj_timeline_wait) +#define DRM_IOCTL_SYNCOBJ_QUERY DRM_IOWR(0xCB, struct drm_syncobj_timeline_array) + /** * Device specific ioctls should only be in their respective headers * The device specific ioctl range is from 0x40 to 0x9f. From patchwork Fri Dec 7 15:54:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9865014E2 for ; Fri, 7 Dec 2018 15:55:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 884362E4DD for ; Fri, 7 Dec 2018 15:55:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BD9B2E5FD; Fri, 7 Dec 2018 15:55:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3BC362E4DD for ; Fri, 7 Dec 2018 15:55:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED00F6E7DA; Fri, 7 Dec 2018 15:55:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-co1nam05on0630.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe50::630]) by gabe.freedesktop.org (Postfix) with ESMTPS id C5F696E7C5; Fri, 7 Dec 2018 15:55:25 +0000 (UTC) Received: from BN6PR1201CA0002.namprd12.prod.outlook.com (2603:10b6:405:4c::12) by BYAPR12MB2629.namprd12.prod.outlook.com (2603:10b6:a03:69::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.17; Fri, 7 Dec 2018 15:55:23 +0000 Received: from BY2NAM03FT056.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::203) by BN6PR1201CA0002.outlook.office365.com (2603:10b6:405:4c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.19 via Frontend Transport; Fri, 7 Dec 2018 15:55:22 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT056.mail.protection.outlook.com (10.152.85.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:55:21 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:55:20 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 06/10] drm/syncobj: use the timeline point in drm_syncobj_find_fence v3 Date: Fri, 7 Dec 2018 23:54:18 +0800 Message-ID: <20181207155422.15967-6-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207155422.15967-1-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@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)(346002)(396003)(136003)(376002)(39860400002)(2980300002)(428003)(199004)(189003)(50466002)(1076002)(47776003)(36756003)(110136005)(54906003)(316002)(5660300001)(5820100001)(104016004)(105586002)(478600001)(72206003)(106466001)(305945005)(53416004)(68736007)(97736004)(476003)(446003)(336012)(2616005)(11346002)(2201001)(81166006)(126002)(81156014)(23676004)(86362001)(39060400002)(8676002)(356004)(14444005)(50226002)(26005)(8936002)(66574011)(486006)(76176011)(2906002)(426003)(4326008)(77096007)(2870700001)(7696005)(53936002)(186003); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR12MB2629; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT056; 1:BNZq8DcgigwsgTaLiEB/4cetB4my+/Rr7c3ujtv//0e5Xvj5bDTR6H3zvv/q18whk7rJJU+AYTMDXJhFs/mIoRhS0r7tD6M0yGmnrLKrbGMd4hGG3bDJyZPGBi/b+NqK X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f2553413-ad42-4371-b576-08d65c5c6501 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:BYAPR12MB2629; X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2629; 3:jDzlH/GCQMY5jYXv7tgh5iZ5H5uKTVtFN7+pa9BfhIEFsSbsHkUIRW21C341z2f+d2ocZmHElv2O4V57ywoLYyyEPaVLTnYxkQq1zquDs2gNBV5ZgolqDeahr1wudRJ4f5Z2kMI8stTlpkuwYiLPF2/zYGb8Vn99/6puQt+uIko+e9qfaJDh8VfluPnsivfCmLVPyYVTjIv9O45ucA+RjihCxDMYkUO3Pd6HIOH5+qP1AqC2wDlbe1YlH5XjxePEgTK/fQt1ZxaCClW8ZA+eZt37PMAchTJivjlHpT5lAaZEOTfIppJhVl+bmWW71eZvoB2tYqEReBl8NpkOwPWGiFQTdEqJhRSVlh4dRHGP+Gw=; 25:Ff5iJfN7TkeSDkZXgFjLNTVXenTWtpMmfZgtkbtsEbAyY+tLNkp9SD5kfq40JOAAka3CxyfJt9AJUyvpWlTlix7Bfgh5xzko9eg5HavOcuOQbSOpcB0pa3f1FhrZk1RPvosPmMKY04XvmtHtTO/gqngZ0TkhJXLPkIV99x7SrF67ZEaVseIqwVH/kgyrqaUV/+uQk0AzBpShA7X3a5sex+a9ptl22Ni2rycXcXUre/saXqnPbMjvlTPB+JEwAm+OHNNao5GvhRoxNEPuMybSJdeuZ38AKRZtuOrO5KajcMntf8Mksn232UPrR0h3Nw9D9rA3w5CKLqsP7orb+x78Yw== X-MS-TrafficTypeDiagnostic: BYAPR12MB2629: X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2629; 31:BBGtzlWiOtTGh8ik+1QdUFHyElf+UUx2u/wnG0EQuI+DTlILLGlbt6MITvHhP+PmRopDJ/MBI0hs7rXc+XGDAVLlDtLPFAW5J/1g6oNYpXpeZAl/OIqjS64+wydu8XPlMPxLBR1787SuecnHB5V1EfXsVdbRCbWPh/NiPhUGEHNOSMcQCS5kGo7mFXr/i20m0UNGLlkROxheOgKFxX2woMdVPAnUWgtkFmKq6X1yXVU=; 20:YVY9q5reypZ8l1dDPvtLiwueWehZ4tuLhM3xVcCMhVSCB+VdJ2yotRPPRsSy4fhcj8fsNaSymfP7pmhcsVHKMT7/6gPPlE5QTsINvbc+2XIFFXalbSkA6B9a73bEcPOXdUM61Zw4pJXIRaNgw8a+R9R3Ak9GfiYNs5dNGTvK4UOm8C/LT4xTQKr9CaKKFZn0gH791qzhf2gtesgUXNGhyKVq4a8PdGwuZTjS6r9Wn38hDVucqluIExilgoUYevWASZfUffnXlG5gACT9QNktmlz3t/yIYXudMW8ip+KOxAJWdZNSXvZAKq/buE+oM0QVKVTdJ8WgRA8QKpu51/QcxIuk9nr5zbVKHotURukn3RcUjRCeT/vHQj6/QE3we5HMQlByIrzirCm/5SUfl1rqhV14bFQYxgR0D+dB9XXc3AaD4O/vPOKfsrno/IUB77POVk8cCwTEHQjibS9E70zr1a7GFjfWbRdk/NgzedH7YPvtwbMlFztRdz/z5Fx7YW/C X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93003095)(3231455)(999002)(944501520)(52105112)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:BYAPR12MB2629; BCL:0; PCL:0; RULEID:; SRVR:BYAPR12MB2629; X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2629; 4:DsOjUYQjLpKAbmSMgzvPxRBeJ19mFrVq3/3d5bSifcAheJic9FIYlJRzuwAT+dkuuSt3NnDKLOTmPS0YnWbhGwT+uzQJjBb3QcW+tXS9eVKvS7qs8JppV320pyK1bjJsVUwvUl66e0nW2SUySXBI6YMPTE56Ch3+JK6b9KEWvFktrU8NHDoQco2KLNV9mPz3HOyvHSWXdnOBTLVu7fkmfFf3ikN7T3aAgThynl82kSX9WW9mQoRJ2hNZNyT16F/QEyczdwG4rhFPcrERbqb/Hw== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBYAPR12MB2629=3B23=3AIFKAnKG?= =?utf-8?q?tqt0i3FdmTf/yATzxca84w3n1/r7rNRDZs2SnwrJjsoJoIhnSpK6pHFhLqkzRcxxC?= =?utf-8?q?1cPK24zVXWugT2YLw0S2wcAy904hSd/C3ru1n3AqCXxcZZpnc5UcqrucHVnOQcLA2?= =?utf-8?q?UkpiVnTqyf4VaLT06tUw2J+Ehd+Cyx9F5bv94hI9tywl8F7OHgmdh870UV7k2pVBe?= =?utf-8?q?Q8gEV87v8O6ZKaSssoOSmu2FGQEkr37lHviMSNrHHElNgEIttx4M3VHx7eZwtyc2P?= =?utf-8?q?0KmvTNqoRgVPSULdSP5ul17yxFdP4LZjURR22lF80TnKuLDfbrISfPxgQlNj9b9H2?= =?utf-8?q?u0qjrOuiAayU8yuKHwf0Q6MCakucvuUtcC5+GmmkW2fRRE2fkJt9K0YA5jG26qLbr?= =?utf-8?q?B9dh+6s/yvyF3cTYUAZA5vA5ltQ2Q5uDk9qgNULtYtzH/jQtFw6N4S6JD2a4JGCbN?= =?utf-8?q?HVszZ6yHoioJeGGBn1lUQGc4n3WaGYEdQsMqiXlfssdpOgZuHBlpsrwSpI7VEJS6z?= =?utf-8?q?fl5m37WbQrHhC87KxKJhcRU1f8Nr6SeIBdZaQxlexYdGPM8hf4nUlwdob/NBkHrIU?= =?utf-8?q?PpJXHP0QqEm4GlN5mDfIeQ/Eqqtnmdg0MGVjhM2BgAuKFtJs451chrtiH5TwAPFkR?= =?utf-8?q?PvP42Fs7LC3xQ1LuIrfUrgmjkYummGppcfMP9YoXJN32oPdKvVONRLQWZHfYAHalK?= =?utf-8?q?IXOOnp33cHt8w4MHvqLf47pk6jaPjDrWfmYMZIGS8R4mTGycO3t38bv574G8EAc6t?= =?utf-8?q?lv4V5/ZyIfymrKY7Z5YieludWkRrn2q1no4f5nDSK12s0JTqx9U0nZDB+kdFjXQ9L?= =?utf-8?q?WcW2f78YmJ6eT/d+r328BQ1YLlrA8QqEN/SEjZ5DRy5Ade2ODXLY26YfWlXdIbru3?= =?utf-8?q?XtkPIpOs7ahWagmiHw8NDU/Os35sKKhyS6tl9eCc6eQWXnXnIVnKE7HxqRgfE8xfr?= =?utf-8?q?/GQOo+H2rWNa+OUT6BrE4zV4HezLafY+AyfC5iVxE64ws5xwWtvwJSLJJ+NqSxcou?= =?utf-8?q?5VrIOV2M/iZrwxUPzbfXqeAxoUoQNwcPRaRtbOeps4ClLoWZnxXLvgWvvwPg8GDIm?= =?utf-8?q?hGXbZ7z2QRjH6smuTmpvPlnOLWcgQdLJ43szgiJQZ5cDC8LLHCb/1D7055kfuQYet?= =?utf-8?q?eymmzveaQfaHnEmwx/iZ1xQBP/qhEWmM/0koctPuro+hzplPhEHEHelkf0x5wy7Ny?= =?utf-8?q?0LTfkJd5CZFFSN3qs=3D?= X-Microsoft-Antispam-Message-Info: q9JH7JNFYJCKZlvUejQLdoba4TcY4bFPmrEMYEVBNtfOz+hiZ/TwUo5Qc6oHz/6fzSuPyNnybBCKdVAYEFhSCm8XPWIRdSLgjhYueJrJkyptcwxCRsJ45Mg42iNRqDVIv9smX0LH65nivxzqc9kX2ANARSP2KQmHsEdTEmqVmdBCekRckpwD2yrwwb/n+LfRuVUjwNH74TQB1FKZABjiaEymh4jVruMY/SqsdI/pcXv+X0302imKocIW2hYCIsmACTS2VPo0eHAkVHRuHSUfGC7/MeWROlOr4lggLwhZSh5LTeeawiVEvrMb6cOM0VZnZIoSiSmVBVrqIz3iUB7Dev1ZbxOIdNGtRRkgmc8dMBo= X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2629; 6:GAzNPKH3vnmIm8hSUMv91aKYCbU7/VqUVbKw1M7wuTzlEGaz9pleJOMroats6QhP69cgqDxXtuMiEsIS2pKDFddlwnHLRi9upgTMj49J4NcPkhBgdxyo8apmMKhZFLr3aTMPYNyQ9EkjyI6cxJt3UAUNpgJYBhx2vBoNTKmJF1TnxVyyid6fcWtj+tJov1GEwHk/9DjL58UZ3p+++JlE916L5PPAcPJ8qh9niZVxcixgSxnaJxN37ivpUJ5bwEcguqXd+YEKyMfLdE/LCLPME6w8OfKMUs3q+QdWmdRAJcDmBxHh/k0GRScp88dprA20UbK/LW8t0sGhWFJROyaIwvag/8aGoJ7O5Y/LyArDP1QhlfB+loNROtdUX+bHTLGxSFd3KArue9Q6FcLR0Us8x5ZbprTzqwasHovbGKyfbkdAKVCVFwZyzHl2fD9HINYF4Y0OuAnArbes75wuOqsKeg==; 5:pagm2Ls6rTQclkc5qXap4YmwBAPbcKTX/dgpmsIZmGuzFITccAnlkWYWfnHrxApFrcAmp3yWeFVewihTzLsUzktLI3JmKWWrYt/MxI23VMGeSdYp+fH4ulYUFXRwzy2VF4Zhx4HiyZzx1+0pt6DDLla6KRfiBVL6fytvWowUlYI=; 7:O7gULrVQZKuXp27fWpp5Ol0fSDHPEGfifUYxVbQHZ21K/KoscQMZyuRMl/IXMupr0Chku9lAUYjm5lvGmYfk9gLrcaGo5TpulYNtYIKzbioYgqf2birYmUXfBIcZIZmti00OK3Hnxconacu9wIOxiQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2629; 20:ObQodEiqJ49t4MNMLdR6MWFXzB1yof0/5uHR08Q2Mt8xA7n6DsxxGUNGutoEA9mX5rbwF3wF367lxrnihMMjo2i3L37Xk92a8NG6rmx1COoK0a1ROBcnhsKOhc7FaoVvK1QyLZIO9CAKdC+5oRM7BSbXtU+CqbeiiaJbAHXUZTL4SwBUOXThjHKJQ8XyyOBR/fjFqEL9rHcZ0kClbSfu0Xqx+izWwsKi7CO7R6N0gUmfQCp8oT5W7zDQ7XY5XdgB X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:55:21.9142 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f2553413-ad42-4371-b576-08d65c5c6501 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2629 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: =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Christian König Implement finding the right timeline point in drm_syncobj_find_fence. v2: return -EINVAL when the point is not submitted yet. v3: fix reference counting bug, add flags handling as well Signed-off-by: Christian König --- drivers/gpu/drm/drm_syncobj.c | 43 ++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index f97fa00ca1d0..282982e58dbd 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -231,16 +231,53 @@ int drm_syncobj_find_fence(struct drm_file *file_private, struct dma_fence **fence) { struct drm_syncobj *syncobj = drm_syncobj_find(file_private, handle); - int ret = 0; + struct syncobj_wait_entry wait; + int ret; if (!syncobj) return -ENOENT; *fence = drm_syncobj_fence_get(syncobj); - if (!*fence) { + drm_syncobj_put(syncobj); + + if (*fence) { + ret = dma_fence_chain_find_seqno(fence, point); + if (!ret) + return 0; + dma_fence_put(*fence); + } else { ret = -EINVAL; } - drm_syncobj_put(syncobj); + + if (!(flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT)) + return ret; + + memset(&wait, 0, sizeof(wait)); + wait.task = current; + wait.point = point; + drm_syncobj_fence_add_wait(syncobj, &wait); + + do { + set_current_state(TASK_INTERRUPTIBLE); + if (wait.fence) { + ret = 0; + break; + } + + if (signal_pending(current)) { + ret = -ERESTARTSYS; + break; + } + + schedule(); + } while (1); + + __set_current_state(TASK_RUNNING); + *fence = wait.fence; + + if (wait.node.next) + drm_syncobj_remove_wait(syncobj, &wait); + return ret; } EXPORT_SYMBOL(drm_syncobj_find_fence); From patchwork Fri Dec 7 15:54:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1BDDA14E2 for ; Fri, 7 Dec 2018 15:55:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BBB72DADC for ; Fri, 7 Dec 2018 15:55:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F34952E5F6; Fri, 7 Dec 2018 15:55:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6C8412DADC for ; Fri, 7 Dec 2018 15:55:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DFFE26E7E1; Fri, 7 Dec 2018 15:55:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-eopbgr810041.outbound.protection.outlook.com [40.107.81.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 815076E7D6; Fri, 7 Dec 2018 15:55:38 +0000 (UTC) Received: from CY4PR12CA0026.namprd12.prod.outlook.com (2603:10b6:903:129::12) by BN1PR12MB0051.namprd12.prod.outlook.com (2a01:111:e400:52::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.22; Fri, 7 Dec 2018 15:55:34 +0000 Received: from BY2NAM03FT060.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::202) by CY4PR12CA0026.outlook.office365.com (2603:10b6:903:129::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:55:33 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT060.mail.protection.outlook.com (10.152.85.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:55:33 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:55:30 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 07/10] drm/amdgpu: add timeline support in amdgpu CS v2 Date: Fri, 7 Dec 2018 23:54:19 +0800 Message-ID: <20181207155422.15967-7-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207155422.15967-1-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@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)(39860400002)(136003)(396003)(346002)(376002)(2980300002)(428003)(189003)(199004)(47776003)(8676002)(4326008)(2201001)(50466002)(305945005)(68736007)(66574011)(5660300001)(53936002)(105586002)(86362001)(106466001)(316002)(104016004)(53416004)(426003)(7696005)(76176011)(23676004)(14444005)(72206003)(50226002)(2870700001)(5820100001)(478600001)(486006)(2906002)(54906003)(6346003)(110136005)(26005)(77096007)(186003)(336012)(11346002)(446003)(476003)(6666004)(81156014)(8936002)(1076002)(97736004)(126002)(356004)(2616005)(81166006)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR12MB0051; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT060; 1:fiKDlRkTtThot3Mda5tabkNF40FI54RqIpgr+vtbDDGysTIjG5I8NOACmp/GLV9jcSsw7mZlOzE3R0EGzL9zniHku5VOf1cRjzs41WaQK+OiawCf/xAyk+QbKijW0nYO X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f11bdd31-4314-40f7-50f4-08d65c5c6bc7 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:BN1PR12MB0051; X-Microsoft-Exchange-Diagnostics: 1; BN1PR12MB0051; 3:X9VS4SjhcASCyu4OgQ+ynbg7BCKiib9j3mW8FkSdJPlc4TY0lyxEIPu4jpB+4jJCDt8bVvvunDXzqropUs2hkGp3VL7vKFiHThnJG2t4cnsGSjNQQI7Xh+RLgBxOh/X0tYrodxKluuYrgc6fEZVCbEvaFzo0WRvSyTZV8IjX3l0ecJ3ESNj6QZK45SwDC3mUTxtzkMfWsWpSUNKKzKM9nZ7EMHqtD8GQLu1LE6/t7wvZEty5oTau4oDI3ZHYJ9TNpOdv41GSF9G0iCnNc9F2QlF0EgE6Ybu0rsKPmQKrJ2pL+ijxtz4DbXp+56pIlNYju0UWU0qtKXU/MD97KDj5SV+rNKMeI9ITfkBYMnfxa68=; 25:Sn2Rs/E3zrlD24SNjyoZpF/wuYdQ2j//LUV95PKmxRinlSlkFfFxZkq8VdZ58JH6n/lp/8114mzLwQ6HkcHIIREAM8rI7mjjqUXfp7vMpKV+atyb5Ph8A2zXe9135f1k1IQY0GDF7hJ8+CVFex6LYbaIu0jEesa81D871Wbyeqic6pNJTAShyM3sSWV5BoKm2yOcwsb0Q522g/e52HI60J0W8fM8cIRWt1jgotBOiniCPXoMaNXSqG69psxdz0RfZg5ESbCAVbuZ7ztLHsd4JPrHY+i8+5/Urqw9Oa5GBUxvvPohL25fnt+Rp7qUNqUxbAh02iMKi1rieTWO/sAGnw== X-MS-TrafficTypeDiagnostic: BN1PR12MB0051: X-Microsoft-Exchange-Diagnostics: 1; BN1PR12MB0051; 31:m0qfwD4Z0ndGW9lRfUy4/X29b8pR9mCn5Ui79F55Mg4Eij/iMNm08ee17nnbtfRvb3LBd2LmVSgrzQxoPKH+1oDXTtjdeT+lFM4Z1M3v4K2kuhfGOo7n8PLcJtAQureXVDOnEsXFXVffBE+OekV1bRQdsjzJE27MHiJQDW4Saa3rieoh15Z71VvrtQcIudhTT3excFOygxUcb52zn/ulKANh/L36vCPzO2tJmb/ygas=; 20:XayotTe6s1aU3TZqHNNAJZfAia5GgxeUfkfVUaNm7YlVk/GiLuOSDmWYIS6Ap9ZUFGSF8N2/1kvbc+8H7IMLRZ+YwezaKO8LdrMdkASxRkB+VHeRPy5KvOMABLq074ObQqWHC2EiyVU/GXQICKUvuWD4xQqJsBcpDlmBjJUIphDnfnVWWpIuh8jMykPLuXpJSEOfyimzj2FgGBuUe5eXvmT+x3DEWTpA+8kofzR37BK2AMV34eKamvvDUCVpJABt3MjHnpDYyuU7YeZawuQZArYj5iLrErlpCD1kbG4olMQMgeV7r9l0+uzc8NnpIE4cVdaY52dJRzskGfEEZcXe7aRucObfPkNN81tdO8d2xGVJp4IwGxmQeSBaswF1evB22JdK/BhMMykvyOmWcTe5pfiJdTx5M14WWT8JzA61k8/L+gwtFt52/JgUIgLDGYUG7CDtr87KgK1jLpG5rmnkWuxBPnlTbFLsCOu5oXQGj/CzGUlCHCT/JUOaQYIUUwWN X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93003095)(3231455)(999002)(944501520)(52105112)(3002001)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:BN1PR12MB0051; BCL:0; PCL:0; RULEID:; SRVR:BN1PR12MB0051; X-Microsoft-Exchange-Diagnostics: 1; BN1PR12MB0051; 4:OQfqDf/JhJ+qZBF/YzPFEnFgqcNgdDh/CkEZVTFDMdPsKNO4AtYMna6g5ZOcN5kcc2W051XvN3JCbXa2ZT+NIPFGIr0PqIf/dZOJlkr9rCOKox5Ue7UkIBKqmQmBtrh7F2ksMOp+Iy0qHmhTn8Sbyt1NBNPKFhOdhrdUwm5TQAgsM6Q0XEZLA2LVsJy+Is/SXDNZejblIhwrtYwaPsk7ucFCOLfD6qjM8WJj97r725bbRisKFmww+JZP1sExrW/Qzkw/9MNc7f9QrFYFa+tvDA== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBN1PR12MB0051=3B23=3Aq8y1RpE?= =?utf-8?q?1eXcbID/yJ6ui9Dy2YWspz/7Q6vZcYQ6LVrd9IPEramZS2O+fJBkX2GPobbOSd80s?= =?utf-8?q?oAeW6sC9UtCHBZQvtpHy8L8hu4kEu3jNFw4qKtD27w2Gd3Jyf+RmdLnyZo3yHIPQX?= =?utf-8?q?Ws4TwIYT9h98UV2tEOAEqGalUqV3i0ZSoBw0O4dXrw51DeLaRlt74O7Hn4EeV3xLC?= =?utf-8?q?wA00xV9mkfD874BH8CLBg0QUUkKKjDxzuPlKhGPXHHWyFQug87SC5itzu48ka9OoI?= =?utf-8?q?c4E8+uU/2EXiBZuRHi7gzgNIe56MMFgGOIcT13J0pE5S4hqRIsYhkLOZLQWbG2vJV?= =?utf-8?q?9J7Br7/jrrDf8iJa5mkWokdkbxoj9D1OrYQVvZ+I42elwOBHu3uIudvB97j0Q5fLo?= =?utf-8?q?Ke6sdiV7tL/9gko2uwRCOnZXHlnW16LJCDrBRmDASO/ZglhVfEXrFo8W4WJwMH/A3?= =?utf-8?q?H6Fi0HHNbTo8oegIXHJJRM02yOgK7pEeFxM0PjVkznz4JD1YEfWrzXHe1fM2aBQIB?= =?utf-8?q?QMJHDWfcIiuwizPHxYLqf8ZokSbhh9jMn6Pu1cOqFh+B6DDGO8VrEiMQu10NVUPGs?= =?utf-8?q?mHI5LAY/q5eIM4wt4tkPGh7MNQnG7qhfAYbD0x4/dqt2+3jyN5mdPVBd0vyM/ZyF4?= =?utf-8?q?Ix9lD8oNmHaerflhfPWKsGPIqk7dInsycLrnYWyoqgrRhlG7ATsqf7pwjdcVfnzGV?= =?utf-8?q?UcPSMpBAlzX4xOzYCgV0QGMfhwFKpbxv/SftJxgZfyPKFetB+amqZ3ydiKBm+OakW?= =?utf-8?q?auGWEyfgisl+dQRjMa+WAhu+b0+O9nIy8VL/To0cvbyDBzwxYTZnZDT6B5nB13xwz?= =?utf-8?q?kT/t0Sc//CXI80rX/ngwBhnnDBJocq+x08/iXGTq95GRF+DMFyaT+hAPEY2EwkvTf?= =?utf-8?q?Ukl1aPMhjXowVSMUSg4lv3At/IB73IiAtKO526Ogj2bAN4vjv+wzDfOF2xxNNwAFP?= =?utf-8?q?vomK55DH2xvUDh/0CM7mmOLW2VFfb146Fcqorsagaj9Azs0saMndhaEDJloCV5bea?= =?utf-8?q?OVL50BMuzc4zoM2uW+OekgyLQOGa7/8tRrp/B0sGfQFtWI/NGbqH1X6iMFDO3G8na?= =?utf-8?q?Lmz5JDsVs/3uPoTrdm7is/PG8AAYkM41KioJNsfW8VDyNeqVP8xFdo7wcA3DhpRDi?= =?utf-8?q?HZME3GByOCSM1h0jn07mGSQgLJkYesljTSHNlkbPdlS+HDG5DduBT+DjgeaMxLxin?= =?utf-8?q?6D9H9VmAkq7Ff4qnE76FwGOFR3AbrVPT8BlXq5?= X-Microsoft-Antispam-Message-Info: 9FQOTNBKyUdoIStjuwcnJjavkm+H3eVyYUgxgK9Oi2iX3+GlaBfbufPcRhUgpn+c/TBUTxUDDFepldTMxncg4/fnwepRw34bky2eBIyV/OMBp3r8/2THhOOKppGnP+RDwYcA76MyaAU47fmJdFz47brlRtI55MnGJX1KnHBqK5FgQMWAFFRAXOmFU4i1ufEiiaByW7/auG4iZFWJUT5pE3W9T/gnKCy3tf8XRvuW5qvHhwa+S2wXRG+MnfUWHCDrXlkp8g0Lg4ac/80R6bWOHM4bTsgk63MpsjUZkGp0fbO8gON9CmjDWFw2Toe4hL/qTnGW545+VxDFyoiyqVaTSoSeDtsqTC9KCz+kl8R6u0g= X-Microsoft-Exchange-Diagnostics: 1; BN1PR12MB0051; 6:+z7b4mXp3beqBhuPYdhkLF1EIUivY0NQfRdI+oY45GoGSZrebLzVeADuJ1pfsGbS0CR+I1xJmSJRAnOEPkXwM9yQuAhAOCFKCeJQC9yAc0dZGR0Dm4QpEFHFKMymm33Qg7uoSnCD5ZGSplKfQkcmDm4iip2OKshErkpuGaJjzchSpaxqr63IHVGP+M8OhG7ATq9f3IHCq6UGmixOqdVwEwDQiO7AWD+Lt4ZDkAx1W0QPLRPthr+yWvrTOq0qheVCPCzn9wdlxM38q/3+VJLNkTSmyAbG6OC+jGziaOSui7iKCC9vjB9i+uN42wUTjxTKT3/WX1jq1FnGZIVkLX+6fJBD5RfqwDM2lxFHeT7ayEUehK3uNxSXUIdzbXJVEkA90SsqQEBeKWxyEiothOKkKjxNWFX5+mLJWLu7F+vGtqig8TXUgOyu9V/bX1Be5O0TvhaciNK/wtJehZo/MuwRXA==; 5:z9jqLRakv4ouGlnPnz9y0Kcn10kPB38354Vx2FCCieitCLPbISB0RiUCcNexmYzeyN1bXoYkr+fkN8ooZMKObi+Qa4Hf4UBOFAF5mY/9NpE46fvM7nLFcu8Ed8XUNrjmVvet3kBLRSV0X1MIsu4it/r+JOtPwUATVn8+jLkUi1E=; 7:W6cU1B+q03JmYzLDeuRle5aJSAV7Amj6QWe4hIB3n80BAWHKUlQZZAuCoqCqhHx1+Do16yP9gdkjZM7wfBtez5xxT7TTRDRu2X14GOmn14XFg+VHFJRhm/UAWJtQlyyp0HFpIygj7yoeiBuDuF/JsA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR12MB0051; 20:cBuVWk6TgI6j0hXAMB/rYxUeWAEdEp96CgJTgaYI+a5nnwH7XAp06WZRKbeswlYydw4Q65tiUWRFkHuR7pQThPdss6mzWC6GjVXzNiB1ELcQ1XtAU/MCSQnP+9kb7o0u/58R783q/2jBQzBnhwgt5uAB0Tx7cBmi8N1R3ghRc3ytX11nSzot5Px4VPpgQyBmU+gEtCh3M/+K8EmWlSYTQhJA+UbukyNcbZ5DQV1awQ0NKGoWOlXlqod9/J+xua5f X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:55:33.2756 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f11bdd31-4314-40f7-50f4-08d65c5c6bc7 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR12MB0051 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: Daniel Rakos , Jason Ekstrand , Dave Airlie , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP syncobj wait/signal operation is appending in command submission. v2: separate to two kinds in/out_deps functions Signed-off-by: Chunming Zhou Cc: Daniel Rakos Cc: Jason Ekstrand Cc: Bas Nieuwenhuizen Cc: Dave Airlie Cc: Christian König Cc: Chris Wilson --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 147 +++++++++++++++++++++---- include/uapi/drm/amdgpu_drm.h | 8 ++ 3 files changed, 140 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 42f882c633ee..f9160ea1396a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -545,6 +545,12 @@ struct amdgpu_cs_chunk { void *kdata; }; +struct amdgpu_cs_post_dep { + struct drm_syncobj *syncobj; + struct dma_fence_chain *chain; + u64 point; +}; + struct amdgpu_cs_parser { struct amdgpu_device *adev; struct drm_file *filp; @@ -574,8 +580,8 @@ struct amdgpu_cs_parser { /* user fence */ struct amdgpu_bo_list_entry uf_entry; - unsigned num_post_dep_syncobjs; - struct drm_syncobj **post_dep_syncobjs; + unsigned num_post_deps; + struct amdgpu_cs_post_dep *post_deps; }; static inline u32 amdgpu_get_ib_value(struct amdgpu_cs_parser *p, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index dc54e9efd910..580f1ea27157 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -213,6 +213,8 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, union drm_amdgpu_cs case AMDGPU_CHUNK_ID_DEPENDENCIES: case AMDGPU_CHUNK_ID_SYNCOBJ_IN: case AMDGPU_CHUNK_ID_SYNCOBJ_OUT: + case AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT: + case AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL: break; default: @@ -792,9 +794,11 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, ttm_eu_backoff_reservation(&parser->ticket, &parser->validated); - for (i = 0; i < parser->num_post_dep_syncobjs; i++) - drm_syncobj_put(parser->post_dep_syncobjs[i]); - kfree(parser->post_dep_syncobjs); + for (i = 0; i < parser->num_post_deps; i++) { + drm_syncobj_put(parser->post_deps[i].syncobj); + kfree(parser->post_deps[i].chain); + } + kfree(parser->post_deps); dma_fence_put(parser->fence); @@ -1100,13 +1104,18 @@ static int amdgpu_cs_process_fence_dep(struct amdgpu_cs_parser *p, } static int amdgpu_syncobj_lookup_and_add_to_sync(struct amdgpu_cs_parser *p, - uint32_t handle) + uint32_t handle, u64 point, + u64 flags) { - int r; struct dma_fence *fence; - r = drm_syncobj_find_fence(p->filp, handle, 0, 0, &fence); - if (r) + int r; + + r = drm_syncobj_find_fence(p->filp, handle, point, flags, &fence); + if (r) { + DRM_ERROR("syncobj %u failed to find fence @ %llu (%d)!\n", + handle, point, r); return r; + } r = amdgpu_sync_fence(p->adev, &p->job->sync, fence, true); dma_fence_put(fence); @@ -1117,46 +1126,115 @@ static int amdgpu_syncobj_lookup_and_add_to_sync(struct amdgpu_cs_parser *p, static int amdgpu_cs_process_syncobj_in_dep(struct amdgpu_cs_parser *p, struct amdgpu_cs_chunk *chunk) { + struct drm_amdgpu_cs_chunk_sem *deps; unsigned num_deps; int i, r; - struct drm_amdgpu_cs_chunk_sem *deps; deps = (struct drm_amdgpu_cs_chunk_sem *)chunk->kdata; num_deps = chunk->length_dw * 4 / sizeof(struct drm_amdgpu_cs_chunk_sem); + for (i = 0; i < num_deps; ++i) { + r = amdgpu_syncobj_lookup_and_add_to_sync(p, deps[i].handle, + 0, 0); + if (r) + return r; + } + + return 0; +} + +static int amdgpu_cs_process_syncobj_timeline_in_dep(struct amdgpu_cs_parser *p, + struct amdgpu_cs_chunk *chunk) +{ + struct drm_amdgpu_cs_chunk_syncobj *syncobj_deps; + unsigned num_deps; + int i, r; + + syncobj_deps = (struct drm_amdgpu_cs_chunk_syncobj *)chunk->kdata; + num_deps = chunk->length_dw * 4 / + sizeof(struct drm_amdgpu_cs_chunk_syncobj); for (i = 0; i < num_deps; ++i) { - r = amdgpu_syncobj_lookup_and_add_to_sync(p, deps[i].handle); + r = amdgpu_syncobj_lookup_and_add_to_sync(p, + syncobj_deps[i].handle, + syncobj_deps[i].point, + syncobj_deps[i].flags); if (r) return r; } + return 0; } static int amdgpu_cs_process_syncobj_out_dep(struct amdgpu_cs_parser *p, struct amdgpu_cs_chunk *chunk) { + struct drm_amdgpu_cs_chunk_sem *deps; unsigned num_deps; int i; - struct drm_amdgpu_cs_chunk_sem *deps; + deps = (struct drm_amdgpu_cs_chunk_sem *)chunk->kdata; num_deps = chunk->length_dw * 4 / sizeof(struct drm_amdgpu_cs_chunk_sem); - p->post_dep_syncobjs = kmalloc_array(num_deps, - sizeof(struct drm_syncobj *), - GFP_KERNEL); - p->num_post_dep_syncobjs = 0; + p->post_deps = kmalloc_array(num_deps, sizeof(*p->post_deps), + GFP_KERNEL); + p->num_post_deps = 0; + + if (!p->post_deps) + return -ENOMEM; + + + for (i = 0; i < num_deps; ++i) { + p->post_deps[i].syncobj = + drm_syncobj_find(p->filp, deps[i].handle); + if (!p->post_deps[i].syncobj) + return -EINVAL; + p->post_deps[i].chain = NULL; + p->post_deps[i].point = 0; + p->num_post_deps++; + } + + return 0; +} + + +static int amdgpu_cs_process_syncobj_timeline_out_dep(struct amdgpu_cs_parser *p, + struct amdgpu_cs_chunk + *chunk) +{ + struct drm_amdgpu_cs_chunk_syncobj *syncobj_deps; + unsigned num_deps; + int i; + + syncobj_deps = (struct drm_amdgpu_cs_chunk_syncobj *)chunk->kdata; + num_deps = chunk->length_dw * 4 / + sizeof(struct drm_amdgpu_cs_chunk_syncobj); + + p->post_deps = kmalloc_array(num_deps, sizeof(*p->post_deps), + GFP_KERNEL); + p->num_post_deps = 0; - if (!p->post_dep_syncobjs) + if (!p->post_deps) return -ENOMEM; for (i = 0; i < num_deps; ++i) { - p->post_dep_syncobjs[i] = drm_syncobj_find(p->filp, deps[i].handle); - if (!p->post_dep_syncobjs[i]) + struct amdgpu_cs_post_dep *dep = &p->post_deps[i]; + + dep->chain = kmalloc(sizeof(*dep->chain), GFP_KERNEL); + if (!dep->chain) + return -ENOMEM; + + dep->syncobj = drm_syncobj_find(p->filp, + syncobj_deps[i].handle); + if (!dep->syncobj) { + kfree(dep->chain); return -EINVAL; - p->num_post_dep_syncobjs++; + } + dep->point = syncobj_deps[i].point; + p->num_post_deps++; } + return 0; } @@ -1170,18 +1248,32 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev, chunk = &p->chunks[i]; - if (chunk->chunk_id == AMDGPU_CHUNK_ID_DEPENDENCIES) { + switch (chunk->chunk_id) { + case AMDGPU_CHUNK_ID_DEPENDENCIES: r = amdgpu_cs_process_fence_dep(p, chunk); if (r) return r; - } else if (chunk->chunk_id == AMDGPU_CHUNK_ID_SYNCOBJ_IN) { + break; + case AMDGPU_CHUNK_ID_SYNCOBJ_IN: r = amdgpu_cs_process_syncobj_in_dep(p, chunk); if (r) return r; - } else if (chunk->chunk_id == AMDGPU_CHUNK_ID_SYNCOBJ_OUT) { + break; + case AMDGPU_CHUNK_ID_SYNCOBJ_OUT: r = amdgpu_cs_process_syncobj_out_dep(p, chunk); if (r) return r; + break; + case AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT: + r = amdgpu_cs_process_syncobj_timeline_in_dep(p, chunk); + if (r) + return r; + break; + case AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL: + r = amdgpu_cs_process_syncobj_timeline_out_dep(p, chunk); + if (r) + return r; + break; } } @@ -1192,8 +1284,17 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p) { int i; - for (i = 0; i < p->num_post_dep_syncobjs; ++i) - drm_syncobj_replace_fence(p->post_dep_syncobjs[i], p->fence); + for (i = 0; i < p->num_post_deps; ++i) { + if (p->post_deps[i].chain) { + drm_syncobj_add_point(p->post_deps[i].syncobj, + p->post_deps[i].chain, + p->fence, p->post_deps[i].point); + p->post_deps[i].chain = NULL; + } else { + drm_syncobj_replace_fence(p->post_deps[i].syncobj, + p->fence); + } + } } static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index be84e43c1e19..997222bc1afe 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h @@ -523,6 +523,8 @@ struct drm_amdgpu_gem_va { #define AMDGPU_CHUNK_ID_SYNCOBJ_IN 0x04 #define AMDGPU_CHUNK_ID_SYNCOBJ_OUT 0x05 #define AMDGPU_CHUNK_ID_BO_HANDLES 0x06 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT 0x07 +#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL 0x08 struct drm_amdgpu_cs_chunk { __u32 chunk_id; @@ -598,6 +600,12 @@ struct drm_amdgpu_cs_chunk_sem { __u32 handle; }; +struct drm_amdgpu_cs_chunk_syncobj { + __u32 handle; + __u32 flags; + __u64 point; +}; + #define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ 0 #define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ_FD 1 #define AMDGPU_FENCE_TO_HANDLE_GET_SYNC_FILE_FD 2 From patchwork Fri Dec 7 15:54:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718421 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 41E2E15A6 for ; Fri, 7 Dec 2018 15:55:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 305702DADC for ; Fri, 7 Dec 2018 15:55:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 243902E5F6; Fri, 7 Dec 2018 15:55:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B91542DADC for ; Fri, 7 Dec 2018 15:55:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 401176E7DF; Fri, 7 Dec 2018 15:55:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM05-BY2-obe.outbound.protection.outlook.com (mail-eopbgr710077.outbound.protection.outlook.com [40.107.71.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id 29A126E7C8; Fri, 7 Dec 2018 15:55:37 +0000 (UTC) Received: from CY4PR12CA0035.namprd12.prod.outlook.com (2603:10b6:903:129::21) by DM2PR12MB0061.namprd12.prod.outlook.com (2a01:111:e400:3c11::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.17; Fri, 7 Dec 2018 15:55:35 +0000 Received: from BY2NAM03FT060.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::203) by CY4PR12CA0035.outlook.office365.com (2603:10b6:903:129::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.19 via Frontend Transport; Fri, 7 Dec 2018 15:55:35 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT060.mail.protection.outlook.com (10.152.85.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:55:34 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:55:34 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 08/10] drm/syncobj: add transition iotcls between binary and timeline v2 Date: Fri, 7 Dec 2018 23:54:20 +0800 Message-ID: <20181207155422.15967-8-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207155422.15967-1-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@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)(39860400002)(136003)(396003)(376002)(346002)(2980300002)(428003)(189003)(199004)(97736004)(2616005)(486006)(126002)(476003)(426003)(36756003)(11346002)(446003)(2906002)(1076002)(53936002)(478600001)(72206003)(336012)(5660300001)(16586007)(305945005)(8676002)(77096007)(26005)(50226002)(68736007)(76176011)(110136005)(81156014)(81166006)(8936002)(53416004)(48376002)(575784001)(51416003)(47776003)(14444005)(106466001)(105586002)(7696005)(186003)(316002)(104016004)(450100002)(86362001)(4326008)(6666004)(356004)(2201001)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0061; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT060; 1:3seVPZlwYEvrF0Yr7P6Dz+O7RVXK92sgRuMsBkZ2rnOfPuGvoK7Aw3kxGE7UaR3Z5yV0qEEYV4h+dynrAlxNEKF3E5siCL0lnf3Gp70kcyE2Pr037b1Qs4+BU+wnaeL6 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8bc7aca2-68f2-4da8-f5ea-08d65c5c6ccf X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:DM2PR12MB0061; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0061; 3:Y5T82KXcBJ1k6lwhW8BnqbFmJA9re1egRGRmdSP/Ia988OwdLIbIKsrnEG47CLuZddkeTSY6OgQvOoi0HFnYyRDGfp63zya2Ai/I37fOZu0UjIMzsZ2BBaq8SYroU+DTIIFznD1mDUnuqwnPCW0onK1rKHRNui8ZcPP/6cwU90E2WKEgi7lzRsHhidLyz+wfZO4nvBjGKg+2iLF8zinOkiQjX1rqpt1sU2KIC9HabbwvD52m/s6P7aPXYlaHA4cqkWtJbMpYrpP3LB+rl2xED29LBB3zYXdJZrI1iacoDy6WIuX445bgnt5Hbe6ytJrDaq2bjM4H7As2vPPGQoKz3883YadZBHh4I2sZeDTLapw=; 25:Jok5QqUQx5p10L47dETaAFxX0kB6AhIdyXDhL3m5N2Xp7BRz3ESB0LnuMLO+pE5w/iQlgMu5xWuDcJEa0m4k+k9z5vQgPwArcAXA5tv62tMYc+m/wEVMlXTEmz/39iORXIKLdgFWgFlwCIntSpok8GfxqYol107dFc+pfhrquYjPu3gd+ue9K8QLpDQg8DmnR05xIxnZobXk7YPAxJ54NVNX0g+rFGHBx4nEg5s7BxzoNLRw0t5Es3HOCHLRPflHpQsN7SoO0idqwXBiyCAcWYUP0cieMpdc9bYzJQbrqMZJpEBnGcDQYhaQ2XtK+7TsjElg0OTxKzlONNisqHjoPg== X-MS-TrafficTypeDiagnostic: DM2PR12MB0061: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0061; 31:ovrBiiFbiBz2BzKb1O0aX6Q2o+pZBz+DsL6Agz4P5CaLLo5Cnf85UCc8r7KyDCRCx0lsC4zO0emDGEs0HqfHjS6OXOM8Y0350bYOlEIgP8KvaLZRbK9uGB9DEA6tT27FVmhukXrgU+Mwg02IgFPgy434yLSHtntHyljE1OIXLD6gr3yTSf9EF0i+YmpL+FUN7UHW7yLOV6ltjXspsmMZfgdQ4H3wlRh+L4AG0s6jGUA=; 20:llSFIJzD/3wu25Rr+PgBS4CgmQS2aXGV4G5OpYIxWAoI8F/NWhSXRybxs/q09w1ya9+5bZ2d3/tyO+Gzx2tbYNFUqUh2444rhrH+nMQo+SANipzyUSDGcUYPGuUEiIJq9kutUtFtDMXo4/4HwTiCAlKJO19M4JeyQfiFgBSjKertfZbtYDJqVmMDzhuvHNPyOVyy5UKWXNAqAcSwzRiXXy//5sImM3LfGCfEy43nTPvpN9wzHseoREPXxpzCBtUnylCUfK26pwcvUgSquR6quSdC7p+M9GIxeI/tcULJeLg5HyECDf8ME2IvAdyTJoaRu0gazQu6zdNnOO+3p9yRMYNJeRT8apQLv0y8iN5afkQT+nnZSAp8ozejBl6ezgtnhHHDifbjihKo/e94toZIMXgzxa/T7ONZIMqDhuPlDDwOhtlbRPHgFrLGKpv6Bq+U9toc3mX1woeY48geBpHmRUtidhV9pgR443vt0770VKHZ6X1rTPNyffoM+uEEGZpY X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93003095)(3231455)(999002)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:DM2PR12MB0061; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0061; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0061; 4:hU3lEOOp60JuWLg63QNXh2vI0JSQBCDvgW6/O/YVnMW2wGSVNsgo59g3d0S2rJbkUGliLRL7P6ikFXDTGaOOcgfEAbO9H6pVNa7vnNwsjYvTHJnBQoVsGRoCWIfsSMPV01jB9GxlcGkbIFWS9bMp5gHnlCU1HCeki2kZYtp367fjz094FIhYGP6LzWydRs7IjdpmOpFmKhD85TUfCXMYGAdyg6BgAl/MHLeGtb1MdQuzwKQUIBQOYn8ZKzD1wVEmbLvSFD3vGrHsUC9V1H+nHA== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR12MB0061; 23:OOzIetsFCWkzP4bvQ1GuyxFlk3vEIFOBM9kIn41mv?= gU57uIZNxMvdgWZ+FJzBEErzS9vBViK+uFJzepcwnWH7Yjrw3LG1F8iTAs1+TOKc0G+3cVzMEfZGutkVnoxH7dLB/sMgmh3NoZzWWAFujkArzDlkgmeohee5C7j4fhIwsQB0x6EW0pTLM14dkBe4VVBXWhxcakYCuavGcTxLO8DRdPkJDpX1CAGcWC1JMQh1Fh6tIRUDCJSZiphE/eC36nQNxrDtSXfjxFW7k1UQomZzjdT07nl6EWKHH+VL+4phYr5TQP7agBlVDsRIOmkfB7m3u6JK2VQVFV2171ptJXzNloQ+0w9epw1yRlWWZD5e/z9HCJvhFDtCvnIrXljpkZOnPXXICLgWXLA1p5I8EFbLxgeyH00QTkG5dL0TX8MyxqR77syr5y1TYzBHgIoz27N643ype8uyCRykZBy+zoMtdpN8Bj2iEmURz4pctxeMUyBfKZuEVtj9PXUZoFijgwO4xvh11+6hRs1uIZ5k30o2+VhjelN65Qz7QEx0H6eXU1TBzydcaMTgtQYgyYiugzu+KWHeA/+wcxnx1VN1DM8AFB6UceIgRJKLK5yIlwOr5yuWkF1JOfWCy+wBWpcjZymBYT37PfzxIQSdqouhKr4zTISVsiqC2/svfBzkkesCJYTkYmc69+ty1ptRVmqvoMf9dvVRIWc+i5X7/R2spHKUeYrGQbFXbUrCN9utY3OiCuyzHLGBhV5ROEdQvT0b41zS2KIBGPIZAMQ9zr56A1RAZ1sMqtMuxrPhqWiesoGdxnWfCMpou7JP+yuqEQ0ecXbm2Dd3jJEZTtq6PQvhnmPOMwQqjXCA7ivlSU+asqvG55+gBiBG2h/9HWqgFgQHmtPHT4OYHADvl7oJsBBURIwra42m6x0Wt9HBsKB0ZfAl1YHsCNBQc50b1724rtCANkYbHY3mgFdb+F1IR5eMOf4SdXkGWqir99DFvxVoApsHwhALMId+/5200P+xGtrhkQVGgJ0oNUNuuayzGSItu244owDaPJ6P1fLVRi9JxIpToEYOfJagvWo3RwSSgvmAqNjZyMdpuvjxkiaHXc0KgBtjqI/mMgjv0p2Slv22Y1B3sePS0MST4KiYsGzBWsaJaWUSomoL3rNPeTi2Nqsu+KYProsZJ1Uh3gwITerIhlpxpPm9VX1LplX6jE+6y8EN/uGLDYDu24Npefey4MILptcOa21iEqlp/oHO5f0qdRV7SE= X-Microsoft-Antispam-Message-Info: xs/bzqLmR1ez25zWtr4YNoXytv/xw8qgMnNJNADKrf1VNMMmkfYbrvTxfpGflvg7ArOzlIBnDVag84LjWfQIN9JqjP8qMe+MiKpc6si9penfadXOGsSlMKxWHAUUujfeSgrmp45ONzmIz+s7tAgO2JhikbRID89Yr/GCeD5OjqrVQIawfl9ADfQ7kdC0bn1uHCBkCIKezitooOTJDpRlM+CUS/qQKREkXfupwI9S3bK7BdgSG5/wNTdXsCCcJRg8T2pHDuR5XYVbx7ZKyflxsoe1VKsGAL95tVmcJoqA+RMB2y7Yo3HE3Zhvo8NpY1s9snsxDRNba7daiI5jMbeDjxGNiE1T7kqAouc4ECPUJBk= X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0061; 6:pb23LdHs5Yy68FhZlsqnU7PLbA5tSSjU5NNtXSc4JvbliPCyIrCqQKKUBf7RefqlZOv1b8NBYRo/giFpxKOJZrt8nnsnbypRrfKAN/x+sA3lPFe5kDz4OqdrKj1jYsUMlhKolTiyrYR5h/Pd2AhwgRg5pTdslZ10FMt7mKRA7nCitTdIyjaRrBxkylE1RqqJnYYGE5rTohFtoaaWKY7bv8QOwFtY/MCUbVVGyCo837PxAw+pQVPepXDWUaI/TqGYYpt44ThSewIDPoejr0gIp+6B3x/zHVKW4KSkDdfbRYN9nZy/FzCGbEf/GxiQjm0niaImO8nWJb/g0I1fnHLHXp3olJ9QnxS0g5EH449cXxjMagNL8n4cqjOQGnVxqZwokAK1ZkHVilJV2/tICClOOtf//mmFTpYLdubWzvPK7bNK2dwZVGw2n3NSCoT9oN7LpxZW0hQ+4qGj6xdrFIgjTQ==; 5:UMTPXoerK5hcwNNnLWr0IV694ktN+h3sjsfg/rbVvNtY4TBuzOUZUFCv2IL/IvTrJnjcrJQ46yCxYgBDwX3iFqoZhoDBib5qBQ9KFfgunWEwvca6pqgAfVXxFJ9c4tHw4qbuoxrmfhTFrgWw8vdjk8jXPTTM3irODCt3zglJtKw=; 7:u7rmsllFh3q4TEnMJugm5m9P1FZa/TAW/miRlijG0vjxSNePoMzcIJaPOg1+IkUTeOy8UwHNSx+qrn/++vNWyw7Yx5Bt8nw+G496vscnE4ieDEuiKNJGtqQ2CBJ+BB/0oqROTM6JK+CEvRJB6VF6VQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0061; 20:1/lRcpsaHnsBn5JN8yFr30hGEFEOEEcJ4e3/T890GDaDXaR7ujeswNdxnGV35eBqCPt+JJ7sYEFMkQLzdIf3/iRx6Jv2gUNnIbtPTNnNMfsmY7NmXUEWnPiaMKvBQACQRWPWepc8P6HtlpFOz2C74BO/MhRFcODcLpTcbm80j0KDSL/UAKVXCu4eSOd5NUK/2vfCVU3S0wFhwgjGJ21/Wv2qh2CxWj7NEBrGSkHZdYz0ViRc5flm+oRIXndEddCW X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:55:34.9943 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8bc7aca2-68f2-4da8-f5ea-08d65c5c6ccf 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0061 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP we need to import/export timeline point. v2: unify to one transfer ioctl Signed-off-by: Chunming Zhou --- drivers/gpu/drm/drm_internal.h | 2 + drivers/gpu/drm/drm_ioctl.c | 2 + drivers/gpu/drm/drm_syncobj.c | 79 ++++++++++++++++++++++++++++++++++ include/uapi/drm/drm.h | 10 +++++ 4 files changed, 93 insertions(+) diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index dab4d5936441..06c2adc4950e 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -176,6 +176,8 @@ int drm_syncobj_handle_to_fd_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); int drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); +int drm_syncobj_transfer_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private); int drm_syncobj_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); int drm_syncobj_timeline_wait_ioctl(struct drm_device *dev, void *data, diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 7578ef6dc1d1..e9d4bed12783 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -673,6 +673,8 @@ static const struct drm_ioctl_desc drm_ioctls[] = { DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE, drm_syncobj_fd_to_handle_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_TRANSFER, drm_syncobj_transfer_ioctl, + DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_WAIT, drm_syncobj_wait_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT, drm_syncobj_timeline_wait_ioctl, diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 282982e58dbd..82f0ab96813e 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -670,6 +670,85 @@ drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data, &args->handle); } +static int drm_syncobj_binary_to_timeline(struct drm_file *file_private, + struct drm_syncobj_transfer *args) +{ + struct drm_syncobj *timeline_syncobj = NULL; + struct dma_fence *fence; + struct dma_fence_chain *chain; + int ret; + + timeline_syncobj = drm_syncobj_find(file_private, args->dst_handle); + if (!timeline_syncobj) { + return -ENOENT; + } + ret = drm_syncobj_find_fence(file_private, args->src_handle, 0, 0, + &fence); + if (ret) + goto err; + chain = kzalloc(sizeof(struct dma_fence_chain), GFP_KERNEL); + if (!chain) { + ret = -ENOMEM; + goto err1; + } + drm_syncobj_add_point(timeline_syncobj, chain, fence, args->dst_point); +err1: + dma_fence_put(fence); +err: + drm_syncobj_put(timeline_syncobj); + + return ret; +} + +static int +drm_syncobj_timeline_to_binary(struct drm_file *file_private, + struct drm_syncobj_transfer *args) +{ + struct drm_syncobj *binary_syncobj = NULL; + struct dma_fence *fence; + int ret; + + binary_syncobj = drm_syncobj_find(file_private, args->dst_handle); + if (!binary_syncobj) + return -ENOENT; + ret = drm_syncobj_find_fence(file_private, args->src_handle, + args->src_point, args->flags, &fence); + if (ret) + goto err; + drm_syncobj_replace_fence(binary_syncobj, fence); + dma_fence_put(fence); +err: + drm_syncobj_put(binary_syncobj); + + return ret; +} +int +drm_syncobj_transfer_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private) +{ + struct drm_syncobj_transfer *args = data; + int ret; + + if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) + return -ENODEV; + + if (args->pad) + return -EINVAL; + + if (args->src_point && args->dst_point) + return -EINVAL; + + if (!args->src_point && !args->dst_point) + return -EINVAL; + + if (!args->src_point) + ret = drm_syncobj_binary_to_timeline(file_private, args); + else + ret = drm_syncobj_timeline_to_binary(file_private, args); + + return ret; +} + static void syncobj_wait_fence_func(struct dma_fence *fence, struct dma_fence_cb *cb) { diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index b2c36f2b2599..4c1e2e6579fa 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -735,6 +735,15 @@ struct drm_syncobj_handle { __u32 pad; }; +struct drm_syncobj_transfer { + __u32 src_handle; + __u32 dst_handle; + __u64 src_point; + __u64 dst_point; + __u32 flags; + __u32 pad; +}; + #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0) #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1) #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 2) @@ -933,6 +942,7 @@ extern "C" { #define DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT DRM_IOWR(0xCA, struct drm_syncobj_timeline_wait) #define DRM_IOCTL_SYNCOBJ_QUERY DRM_IOWR(0xCB, struct drm_syncobj_timeline_array) +#define DRM_IOCTL_SYNCOBJ_TRANSFER DRM_IOWR(0xCC, struct drm_syncobj_transfer) /** * Device specific ioctls should only be in their respective headers From patchwork Fri Dec 7 15:54:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E9C314E2 for ; Fri, 7 Dec 2018 15:55:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D67D2E4DD for ; Fri, 7 Dec 2018 15:55:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 618B72E5FD; Fri, 7 Dec 2018 15:55:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 09E432E4DD for ; Fri, 7 Dec 2018 15:55:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 44E556E7ED; Fri, 7 Dec 2018 15:55:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-eopbgr800080.outbound.protection.outlook.com [40.107.80.80]) by gabe.freedesktop.org (Postfix) with ESMTPS id 179B16E7DC; Fri, 7 Dec 2018 15:55:42 +0000 (UTC) Received: from BN6PR1201CA0011.namprd12.prod.outlook.com (2603:10b6:405:4c::21) by BN4PR12MB0835.namprd12.prod.outlook.com (2a01:111:e400:59bd::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.22; Fri, 7 Dec 2018 15:55:39 +0000 Received: from BY2NAM03FT030.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::206) by BN6PR1201CA0011.outlook.office365.com (2603:10b6:405:4c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:55:38 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT030.mail.protection.outlook.com (10.152.84.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:55:38 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:55:37 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 09/10] drm/syncobj: add timeline signal ioctl for syncobj v2 Date: Fri, 7 Dec 2018 23:54:21 +0800 Message-ID: <20181207155422.15967-9-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207155422.15967-1-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@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)(396003)(136003)(39860400002)(346002)(376002)(2980300002)(428003)(199004)(189003)(4326008)(50226002)(104016004)(14444005)(8676002)(81156014)(8936002)(81166006)(575784001)(356004)(2201001)(86362001)(6666004)(53936002)(450100002)(97736004)(106466001)(1076002)(53416004)(2906002)(105586002)(77096007)(26005)(68736007)(36756003)(186003)(5660300001)(126002)(2616005)(476003)(478600001)(72206003)(486006)(426003)(11346002)(47776003)(316002)(336012)(446003)(16586007)(50466002)(110136005)(48376002)(305945005)(76176011)(51416003)(7696005); DIR:OUT; SFP:1101; SCL:1; SRVR:BN4PR12MB0835; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT030; 1:su6dmjyvE4jo6TuJDob/LGYNkBF/TQQIoWhxD8RVvs6KeQ2rPFsswgmUON1MGFCqCM0chWbnpcpYT/SqgVe5/vp5F3qgnwJordSpGrut9WBYXg8Nxu7lH7O3ZSfW3HUZ X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 67828dd9-577b-4538-b1b6-08d65c5c6ed9 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:BN4PR12MB0835; X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0835; 3:spXF1EyOnYQQ+53Brt9n32fpBiz1YTvu6TG/fGurf+cBck6Ti8O1HxlwSuIMfNHwBg8lFHmCL7Mw9IK5bNc0EYHqzHNqNNYsj15gfyt4wikTh9PoNliSUrPaIyubkG5gwYjOMTG7YLofAGkwjSWrYiTmLF3emu5KGxPRs2rt3/afn7r7BS9LpPn+/FGMH3nUq6DHPWzdYTllzr0k5vOpKws1LHxjVdfzU00Pk+9UmKq+oTve/DN4ZgWyiAl64p+99TVe/sxFECvKprhJpT7OwObu2tDC198wlp9GSM3hJBKyd1Cjbzbqe1FGoP8ikQBZrSNempyCoUW2JlPUQ5FyKPBWT0tUCF3ulFQizli8hHU=; 25:mmkqgYxoI+POOdN9r/cZeHcOVYHS6mSBGDa5FGiEgHuooU+R31uRj/OvitSz0o314uARhz94VhYXdkU9NnWiXDCZ2Dwx+fnN7WEqt8b6aH0hKpGIhupLRnGek5Jt3forW7QeqnuGn++G+L9BlTw1t4wT0Y7ZXApaBdu1zOaKZPmMyUL4Tek7+Tg6lIfo2CBO1EqQQxbTprAK9/jG9epZ1yR4bXr1FXMUzqvQhi1igk8nICFFlIpoIWtdPB6nkuf6dOAZJFdqo1gAaLiw0CR8WOiHKx1EcomRQYznKFiY3WWStIZGVMwL2Q9osiqKL/vlzpN0Ant6Vhezy0V9FsxiVg== X-MS-TrafficTypeDiagnostic: BN4PR12MB0835: X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0835; 31:03NtzKZsRp4R4EiyI3Zbe6YS5jO49CbSlyTwG+5tHK+HZW18EaXkC9EcNzHSmFgBtxUT3Q30JI+L5qZt/Q9jlrUaU87uGUKtOiFKPXZcincQDTSRpzwm3qGrSEocFMIxOF5eUhMSEGPidsAw3Fyvds9aC4UcWQZffOADTh1Py6aqwf+BqxfZK1ojsO2B9pfJr0kp1KeJxCj1Au8zRv2pYTMD5dizvdLVnX4VfAbPeS8=; 20:quqMFhOPvIKQOBVnBGZFGo/ylJmkMRHKcCQthZZ+myLClv/I/hal2nn+EduotMax/xhYzRnUdgZ/LVDHTWOeTmJiz5334m4zmq9c8jBHEzP9OF04JIQVJO3siNQ5YEkILfW7X09ZujCTYO6PmmsiFrDFOCxW2OMvLVu7myk4JGSOdnlK3pRjEtX/DM5J5VJRbkik2A94/6exbgBMSm8mbgMg00QiuIA6hcI2CsIPiiSG/tBe0Oppw1EMJJxWYgUGKWVy6cB81rwamoKqMtYYF7JPaJYLlvMLRTUvGD0zvOT83GQySgzVKWGSymu2GWKVcpAsGUycQLMAabiYyL37s2bErJ3YOZ7FNCFxGOzgQZuLSFGgR/VwGkFG6bm/KR1jtzyNx+6yv3V8D6pb9iJO6c/MfbKE5/HPOnucNNPsbIuOp7fjgs2HnG55n0J5YX8etWf4AgT95NSusjpE48YkeK7JaxCbm+ZgNdrkgtvKTloV4kPOvhAZKsMBeH5pTyyi X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93003095)(3231455)(999002)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:BN4PR12MB0835; BCL:0; PCL:0; RULEID:; SRVR:BN4PR12MB0835; X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0835; 4:pl7EcNzTHPE6vS5wWn8mEctO2+WQ5NbjrTcEA3LsRWHpiAnW76MApazewBNClBp9yGZQRJ2mMRZRNhgtWbtcMx4axOBk2cyvByX9WRk/Je9/LLT+nKXNKFijMN0g2pJ/Sxe2F/k97mkyJ52BcjJfZLhW8JmMSwLyWwJo1Gf2965EgjcKeI7RpoRRDUSTu21CJuzAO4w5U3aO0XehB4OP8NhaUAHmqnnCOJAnnCQQKWBl5imkGfMQpdz6cDq2znUGq7qnARYBECkEjbylPmJYuA== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN4PR12MB0835; 23:S2hsbhHY7yh+AkOfdtStb8eA3l2xdGVa/Awyl/t4O?= 2MnZA0SVFiYjKChSSZqKt6nJPS+GmDQ4wAC50CPIHmxepiuw2/U59UFJoWVeKAp47sIif3TgmEgCXKQFELzR4xXrzgyXHJrCU08xo5ZTY1NLZDvfpZcIBXUoGlXDfOM5YVnXesN3ZZl8tGwAJIrBPPUUTPax/gFBl2c5OsySKjx/SWu4kN9+JERY/xexmoLEzj2YliqhDf0Ojkbt43Y7tCNEcup/HxlnkSEO1G/u52Dbcn8FknLsUtBiAaQx7ORXSw52lboiyIPvt0hn5/jFbTTrkC6bQJfjO/Hy6poI2nZwmL9rgQDBKST6s2J0DtTXy3ttf8uYpRUI+EdYn2YAX28iAVR54i0cfOl+TwBPsqeQNo61+W/RbT4LBggy1xqI4gM8CroZmC4a0ltePVtS9F2e+6xQ6hBF1u1wN7pyWR1O9UMMRrqqESOL++HW6ixuhY9GAkewIxL7apClIYT/8/y2U1BdaDpMQmojjaezfs2BMojZI46O6yqQd9qtbNbU+KxJ19Cm+Fbp3rF4XVmHl+MC6wAPJvGSAWRfel23q8+akpbVhLhdIwYc9+lbRcV7vKfBrfEXRrMJO7mGKk0jDbAChlxWb/41ISytEBltw/QzS2dk1z6pU52MqO3Pfo/e49r195s1DZ81b1yusNfGLFqtRKCioj9g7Qnc+PIsN6m1dBadis48l8Ga1m2obz6dG9OuMGrGXNpELPs7xQf47PgVLC/XQwi5LRolEsORBy1ZnLDewtatYhtlp3U/A+jy3ftVhP8IcgPuSRNW7Re6OiT8jvtj27yWaUBr98ZGps2JWZkWJ2VMluJgI5Sw6lSs4pSwDvP+y89hJwticMGMwjZ7v1c5SkKfOLOxUEr6zxoVums5BEm8xLqjmI1gK5MBMynzhyEwJqpyjwMCGbdKknuBoPuTff2M8c7B7gibmJ879+qftX8ux+562abawst8M6oz6x3hIZQXDU+tkytyYcs2GgKXiHQeITA+RVse9SgBveVXwLx+Bdpdw47JCd/kULoVmSO4J6EKC/6YVawhqUQQ22uf4oRidiu3znFQ2/2nUiLgptO9aVziNJoRWkFOLv30WiRy97VVn6PZYdB/gRHeNqmoSF2qJrvV/hzrrpGO85NCzG8KwhENTvVozUb2orRFM2Y2nkpAEmZGT5lfJw8Bd67yev9YitMLKJ3DQf/K0UMhGe1bzu9BHhgdJ56Y2g= X-Microsoft-Antispam-Message-Info: O8LKbuvqA4djCF9DalGxKfAD10RuVuzDcLeXSUyc6e8qBirCrYQJS0sMSvAKg1tcBkG3urtN+0kuu1Gu09cWdiWS70jb2hrM2oO0U0SiifE3bBV3xK7QAVpc7ACiwXcD/CHDGaqHGoHzQFM3IKYNUNATKwdG3FgrWoneCdcvrlJGCt8zVV+IMDtcutj6QhO/CmvD4zM3sYr5jSWq9JPAsGPJOAAGzQOxpH8UxcVs7CpTb5CPJMfpEWR/weUr+JvFmxjEYpW2hPYfUjvaSruFk3lorcVZliZxIuh6FczjhqlpapNeak3nl//XNhhVtxX3VwlCVI5IpYeYRnsxwyWa8zWpotmwzAfwtjjMSJ6t6JM= X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0835; 6:0lRwCcaSncQALTNeVlFDgSYSOzPLk9ToE97HxoMFf1/QtTzi61vBor9t2dXhZXUzHkApQiOE2xie3/QKu0LviuAufoOhwWuVhJZM+D5F2sOKW8hBQDW/Rk8FDYH+JuDC98DXe1iZ3Y1zVl8Nlcbm7ldBwlUYHwHYQAqjfs1arYg6M6RwvTovYumtnY/I/U4/w68gQy3LmnDH2Nvh6GKu4NqLj2U797dQOyxnYZjHtf8J+Mlsi66cZI9iSgaQq38zdGt4GbiVH9lf4tjvHWZdQorZKfACZZBRDy9oDssgFJ6dyq0RdJobbE0i2Z7iO47sIeDOVlpjDugA2ORO/SjafKkkYJEMbId72O+/J2LSOnj2kH4PZL9hLmz1QdFIPuMpHQvuEqexQ1dbveS8nRlyt1Lv0/5VfSaEtByQGhHNRMHwhsNLTz4t6nXUinUORIAAvtTHpyP2kFU7whl4CTcw6Q==; 5:RVCOKZum4LxnT11wCxhOkLHqO3eaCszwM8p+XpVKBIKA02RSJ651ErCCqRKE3OQOK2isZw5Vn0Om4KCLkkCT5K2D+f1pB99CGhCKu7KpW+AdNJ0Y6AUpR//rfO4YCaJIqY6qlqOcm6WH79FHKNT7iVcBANmeck4Nq848sHza4sA=; 7:Q9RylOxec9Ubci806qcQ7+Aa4f08OODnzgmfi/KEX+NKJQrt2n5ZvfcVECw0QnFx6xisJZnW1KbVhlgaBSgooylcNJpQpqVV7oPY6tyjzFbNKRxN7V0UmSgpJIJ+cthqDUlb+s8Ywn68y1+0Yo/ZJA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN4PR12MB0835; 20:bHEtYY/Nu4/8COF9v+6lQ5qIwkmCZaK88nyk216ylPL5+FxIyruosoloaTnVqMT5+b7g6VfuHWGs2cV6IKzn2gL6cVd9REFqvmsvWh/8KvR77TQptuHUQ9NyBCkS9u8WYMGaTbad7DXX62q4p/2goF+PRgCcVwmUbfdyaQa7whsLPrA4g6ie0BdDZ6bfqrWwM68HfKhfrwASF7H7WUR4ovaLR85QW2UBUNDHU4BDnncQub2XXxguNZ+aMtyjkvHp X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:55:38.4292 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67828dd9-577b-4538-b1b6-08d65c5c6ed9 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR12MB0835 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP v2: individually allocate chain array, since chain node is free independently. Signed-off-by: Chunming Zhou --- drivers/gpu/drm/drm_internal.h | 2 + drivers/gpu/drm/drm_ioctl.c | 2 + drivers/gpu/drm/drm_syncobj.c | 81 ++++++++++++++++++++++++++++++++++ include/uapi/drm/drm.h | 1 + 4 files changed, 86 insertions(+) diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 06c2adc4950e..d7a19bd89cb2 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -186,6 +186,8 @@ int drm_syncobj_reset_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); int drm_syncobj_signal_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); +int drm_syncobj_timeline_signal_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private); int drm_syncobj_query_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private); diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index e9d4bed12783..a50dc62dc87b 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -683,6 +683,8 @@ static const struct drm_ioctl_desc drm_ioctls[] = { DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_SIGNAL, drm_syncobj_signal_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL, drm_syncobj_timeline_signal_ioctl, + DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_QUERY, drm_syncobj_query_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_CRTC_GET_SEQUENCE, drm_crtc_get_sequence_ioctl, DRM_UNLOCKED), diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 82f0ab96813e..84a52da5ed7b 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -1178,6 +1178,87 @@ drm_syncobj_signal_ioctl(struct drm_device *dev, void *data, return ret; } +int +drm_syncobj_timeline_signal_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private) +{ + struct drm_syncobj_timeline_array *args = data; + struct drm_syncobj **syncobjs; + struct dma_fence_chain **chains; + uint64_t *points; + uint32_t i, j, timeline_count = 0; + int ret; + + if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) + return -EOPNOTSUPP; + + if (args->pad != 0) + return -EINVAL; + + if (args->count_handles == 0) + return -EINVAL; + + ret = drm_syncobj_array_find(file_private, + u64_to_user_ptr(args->handles), + args->count_handles, + &syncobjs); + if (ret < 0) + return ret; + + points = kmalloc_array(args->count_handles, sizeof(*points), + GFP_KERNEL); + if (!points) { + ret = -ENOMEM; + goto out; + } + if (!u64_to_user_ptr(args->points)) { + memset(points, 0, args->count_handles * sizeof(uint64_t)); + } else if (copy_from_user(points, u64_to_user_ptr(args->points), + sizeof(uint64_t) * args->count_handles)) { + ret = -EFAULT; + goto err_points; + } + + + for (i = 0; i < args->count_handles; i++) { + if (points[i]) + timeline_count++; + } + chains = kmalloc_array(timeline_count, sizeof(void *), GFP_KERNEL); + if (!chains) { + ret = -ENOMEM; + goto err_points; + } + for (i = 0; i < timeline_count; i++) { + chains[i] = kzalloc(sizeof(struct dma_fence_chain), GFP_KERNEL); + if (!chains[i]) { + for (j = 0; j < i; j++) + kfree(chains[j]); + ret = -ENOMEM; + goto err_chains; + } + } + + for (i = 0, j = 0; i < args->count_handles; i++) { + if (points[i]) { + struct dma_fence *fence = dma_fence_get_stub(); + + drm_syncobj_add_point(syncobjs[i], chains[j++], + fence, points[i]); + dma_fence_put(fence); + } else + drm_syncobj_assign_null_handle(syncobjs[i]); + } +err_chains: + kfree(chains); +err_points: + kfree(points); +out: + drm_syncobj_array_free(syncobjs, args->count_handles); + + return ret; +} + int drm_syncobj_query_ioctl(struct drm_device *dev, void *data, struct drm_file *file_private) { diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 4c1e2e6579fa..fe00b74268eb 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -943,6 +943,7 @@ extern "C" { #define DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT DRM_IOWR(0xCA, struct drm_syncobj_timeline_wait) #define DRM_IOCTL_SYNCOBJ_QUERY DRM_IOWR(0xCB, struct drm_syncobj_timeline_array) #define DRM_IOCTL_SYNCOBJ_TRANSFER DRM_IOWR(0xCC, struct drm_syncobj_transfer) +#define DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL DRM_IOWR(0xCD, struct drm_syncobj_timeline_array) /** * Device specific ioctls should only be in their respective headers From patchwork Fri Dec 7 15:54:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10718433 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BB36414E2 for ; Fri, 7 Dec 2018 15:55:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA3212DADC for ; Fri, 7 Dec 2018 15:55:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E3542E5F6; Fri, 7 Dec 2018 15:55:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6BE242DADC for ; Fri, 7 Dec 2018 15:55:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 386A46E7EB; Fri, 7 Dec 2018 15:55:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-co1nam05on062f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe50::62f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 994EC6E7E7; Fri, 7 Dec 2018 15:55:44 +0000 (UTC) Received: from MWHPR12CA0045.namprd12.prod.outlook.com (2603:10b6:301:2::31) by SN6PR12MB2638.namprd12.prod.outlook.com (2603:10b6:805:6f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.22; Fri, 7 Dec 2018 15:55:42 +0000 Received: from BY2NAM03FT028.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::202) by MWHPR12CA0045.outlook.office365.com (2603:10b6:301:2::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.19 via Frontend Transport; Fri, 7 Dec 2018 15:55:41 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT028.mail.protection.outlook.com (10.152.84.238) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1404.17 via Frontend Transport; Fri, 7 Dec 2018 15:55:41 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Fri, 7 Dec 2018 09:55:40 -0600 From: Chunming Zhou To: , , , Subject: [PATCH 10/10] drm/amdgpu: update version for timeline syncobj support in amdgpu Date: Fri, 7 Dec 2018 23:54:22 +0800 Message-ID: <20181207155422.15967-10-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207155422.15967-1-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@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)(396003)(136003)(376002)(346002)(39860400002)(2980300002)(428003)(199004)(189003)(36756003)(104016004)(476003)(8936002)(81156014)(81166006)(8676002)(2616005)(14444005)(50226002)(126002)(105586002)(486006)(50466002)(68736007)(48376002)(2906002)(86362001)(97736004)(1076002)(106466001)(2201001)(53416004)(5660300001)(47776003)(16586007)(110136005)(51416003)(7696005)(316002)(53936002)(11346002)(356004)(26005)(446003)(6666004)(76176011)(426003)(77096007)(336012)(305945005)(478600001)(4326008)(186003)(450100002)(72206003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR12MB2638; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT028; 1:DcqdywQxchkZNB82VbuKsEFmHSWwe6AS25FyIf0HPPUVgZIvnuox5wm85AwYc+SJNz/x/dslJDLk0d4jcD4seHysW3EpMM1ct87ov2UM8724LdquCr1xmMFJZDnQpg0W X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6dccb402-cb07-4932-7eea-08d65c5c7098 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:SN6PR12MB2638; X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2638; 3:DwDsMQVofSWUi5LM+Zh02rwWW6Mj5NYKM3b5SCCXO3YSRI8o/amNFu9rIZ9JzfMqEEIbVV15wS80/VKPhywg7z3EVE7FeXsl2jSx/TJuMir0ywtu8ayhfFvJt8a3MH1TuSce5CG0UEzwWCzGiLtYBvknISSLUjT+6/X+W4zNSltK1LgKENoJ3UE9otbp7BQfZ9fJgXPCLDl7eB2iPeIem25yE4qGQZ/P2LTBnfxCrVUQQumGB8NtVFbggrD2TdI4dbI47WKaYZkwJjl6bGgUKTx3DYKZjn9kvVbTwAi4/khSTxkyz6TUXiohTCNO/vYwk+MyHQD3i3BsvCb3b+KpAhMXk1KwMznU6X4oNwDj5z0=; 25:6MX4XtRI68CvBjsfZglgU+DAZL2Qokl+a+Z6v2RplOSTJfcAU4rXJgdsplzCRnIPOAvSyJwT+Ejbh0Ob3GRdVcq0Pfq3witvsBo/GZTxUbAb3zLZTRpwjeStLrEW6sbG5cOYF6iAfvNkgefk4I/2jBnqG+9M9jcPW6Gg8SRP4Op8j1VFyuQ5bgET9p9zg8peeclfeZ2RxBViQaofqEyY1DX1iKGSxNhKxD+r5T+3TJPOLu1GNsGh4W/yiWd7jWY0y3KOyhLJASINarfChnZrVY/ZCXM3USR7pmnUa+xXVyI/6J7BI9ZD2Y/548a5aeTtO5utKNLVIh8RJeZZ+8haOA== X-MS-TrafficTypeDiagnostic: SN6PR12MB2638: X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2638; 31:9ar7TySabDhI1fNApP4OK709yYwavsOV1hXnpbSqZDGba/7V5r61mVLJQsXrg6KkzSVftud9FJZpr+zRHuoHJjN/j/hPln8jWZdnbHS7bmzRzI6VsBs2OauGgIUo6Q2onyvpF73Q19/SCl9rLewDhTGgVuZZSBiB5NIxC9N8pH/UzFa7L+NuyJ+NVJLt69MNW5vMIRbpwTcw0dSp4FK5zbJlkHZG1TMGTx8h9OwOw8o=; 20:8H48eZOcilk4O24u43RcYY2G8XbRPiC/Z+CYR0SCTQC7zQ6FZHXKuxv109DujlQM9/SQI4x9gwaN1gjMfaR36886TjHivkwi+wb+noho8ifuQwGY0Ox4OVQERlx8xjkXl5C1/GOjU1geRBx9FWZs631sQQIw0c++mwr9wvH8EDuFD+TMknr20gtNqo5LzWsJ1+aCGa6oqZ1rm7BcVC9CRzg692u+SSQTXdavRwyVPfd3qkLriR8J/8ZH0n6LoQFJl4cqc1u12YHaj6+HxXh4DzEOnm/YAy0n+dWdrlbG2yetq0/GaHkFahOqpCBbdRqn6JYFBSwHs60hviag6DRaqYBCh1Kq1DBOg3uTOOSd9y8R5zw2cV0a59oyGy+W1C9BEcjeOqZCyk+Fjbg8mTwXrUACVaAbb1xb1slAZZsm/sSH6JBaQ5F0WmkeAw+dfuoSZkF+wFuU0+yWJLK9K1eh/fXMtw+NVHTcwMX0MojquZYGTcpCxqIDrK7/8wcJwCeL X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93003095)(3231455)(999002)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:SN6PR12MB2638; BCL:0; PCL:0; RULEID:; SRVR:SN6PR12MB2638; X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2638; 4:/ofn9tMMfBiZHgByJ69VUDujhksNEqBXSoMtaSxUyEBKLApFcv+iJ/6Qg4nNscL59+TzAfX0pL0P+BlVsyYV8+m5hKWl0zdaapmtarEHClEQJV4UXBZHsnPjq+HA3ar7gXwQ59DF7FNHto+QpJxBM2XoEJ/VWmFptEETXHI/P6QVOJxRH1p1katAbukh6XwpHD/mvLt/e0BvlxEiFniAoGEg1iL+QfDAYo77BT0jmHdlfVPh+M1KyoHrxC0DqEez5JeE2mPCyTpwN6hY23plLw== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR12MB2638; 23:ULIH2Uh3FwvlWl7vUAm+LK1Uq2xk0/7tvwjroswQI?= kj+wHeB1XYHzuy0QXn4jW5y1DN04TFGN4q1ZDSuaImNg/k/6CKyHFbkYgrkG0zlZ8Fr/mrpAdsIIh0jrzSGVu4ZmEYRgphJmICj+Vficwsd3cU7rlYXJysaOJ2PfYjxcNSVU5C3Klo/fbbZIYqe/vPZCdkwSR7sP1YBtsK/WHA6sR/f5ImG4bSE2wvULGqrgz6b458SVuY4ItC8gq7HW27N79d7kEZnniNWDm4RDO/0Re1JgpGhtuqT6pXmZ1FYhBHe3ydzGx+TGF+RjMk+moX8PEx29QItUobWR9nSCV25W84Hrxgzv+vt9wccTyVkv3PGmcErj2gwH7izyUpIrNKdkEO41jfUe1GHypJrQelqZi5fYAwRl7PSZqkH7Mvt2Cg0PgGq4xnP+v9ZYVCHpAD9aPX1P4QvojPbl6QKaWREdgFa/XS4B3hxjdEvsepdznueNZ9HC9vszcfB6p+wOzDPxLEeTOMJGLcRx8o+c7ZMFTfzDB02GP1Fbl4PKpNjofjPJWC/XLC9Kvty3CIBDvsgMO64n6Jq8jF7SfL8G3FSBJCXr+qKhwbfbuvRkrB8ZjGsCDUgzk9tfINMyGIU2eN8ncTYIAXeXL8Y6N+BPNxaRLWLWFUGnO/zq42EUlf49/6XP+R7jiXs9+AUeUgfFPJnfmXCxoWBaEi+7oNxSsMa9GBqdYO8rwb2JHqWFErb+GxeH5yRpR6u7NATg3dbviIQABw3x7LUEdbW4naY/Coave6u/56DV6H9mkpDcLB45WNxUd0yp6adQgs+uwy9sYMSTGUf/OESsggtxYKdJW+kHFtzi+UX3jopTCGBQMmXcBefAih31vpWXGTW0aPLxAdI75xNpk/hRFa5zKGSe5yFdikqRsc9dgL4Y6e2CUhm2rwg7CsSH3k2BTrx5U40hJD+v03DUXmQoVDBQ23BWy0nsUfDJg6w1Vj7dmaRmCwJRXOO+FxMkhXPHPGAboxGDKEZld/33LK+1259EbJjyfzTdsNbrkH4X3Oe2qA6wrF8oXZguOpr/xWBjVXgf2VTQ32eeq4B5pM1zOet7Bx2PgjaQvTM6gqZ2MWkZTbr29mJnKzgSPa+8YAOH3JGgOlmxrkypVJaOK9kv5+7U2jSptU1KX1Vnq8YAEhB8Upodr8/621bPmaSZA0988ckabVuixYH X-Microsoft-Antispam-Message-Info: GvzVZapmqHrqV4RTACIJgg1ZzhA/a/ejInphGPCbWoqsHd6tDvffVUX7ual7Nq9ZAMiR19R/SDwZgOkeKt5D/NT37+AXsJXNrL4wyt4rbOp/F20CtuiGMxXdYzBxQAyUFzUc4HV1D2PjRxdRdWcHF9SGWAB8aRlcQEKtpif5G9BHDWW2fQSIpbIKjEe0bI5QZg6r9O2P7Vr6jMSTAh4kiLYe6uCId9HmPbf/FCEsiPgLANJ1veP/5TIgovFYr/iRaWpDUr71DLtYLyxhKq3rE2RKqyj18R79VlslRSxPRUkQtnSTN8/G/QkvKsPjiNh4kuz9wzReah6NPi7zzw8ZCWYFTIt3kUtDibYwk855d/E= X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2638; 6:D1jth+UJ8tfu7h6TcnEqlelwscCkOoToJyk41ZlcATSSemoXun9aY4V/6MeCmFa0cHUP7x249yQycTvnM4TR0ohdjsuNcg9i7e13JzRun7c/C63DOBXN1y1e9bX14W6dHUPGbPeI6kdGzd4f5me+tplHheCd+a4ExFMyrLefIrgWg8nSCrIBiG3BnTqS+bTG0CScwQIHewy2/bnyU1FZIxj98j7n0KV7vvXMHjKsUc0gUyRoxGX1sHttliNzwZbtZWPXnYv2pAgIYYqS2aU/hwsmvz17RPu6H+H1p3FUmwrkDwRMgcZXxyesuKKPlFrbK/ki903O5oyxGPsy+hrrWJJ9rPUj0J8X++JEmpX415gHpZkGSKCNevzpUeG5VWkMB6r4TXeR49nOilGRPV04G2g2dMWJUpHsd3KIIUvMA/oXfuLOZbQ1Q3rTkbA8kiQaHLcTTJtWJqifSfGYU59BFw==; 5:lvNBN1/Vprf2AwRk8kBK59qHrF0iDLsmQ7JyjHKmyJT8au2jv3p2LB8Od4zADmGZLOFlLTYWlValX33gErWm7JiHpyMQhRgt2DoDZbip+cIoNqwMfLz5OROeTtrt2wAwY1fpu13uPmpzlwav2VTzCCFz+ZW/iS7h4aGcfw04sGg=; 7:dP9O1ug9DZTR1QOfMmFsDfOPZIFUU4k6+QThCvyYwL2UDnGC+cebSPHZVE11K8jr7+ZmqeabRq7KBmZS6TiHENS2iudJw74hWJXU/6ve7nxKbhaSPiqtqftK7wiBT0lny0+ctOkfJDeFgNzWEMqeOg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2638; 20:Ro78ZKybxVEhhsk/PmvyVBytm2n8pGyhc9zbXCc7KtGodlD0yGKoY9HQuiT4j4578OGKMDz+mRb5fougr//0hCMtdR/sBS9LB2yZnvrYS9AlfDbmuShptcLpmdCUZtmHyWZvVRBW8fVxeTzCCYsrsX5l+6aKcIfLqx/dhrgcS4LQW5hSP6mTn50UGl4KyQAt+zuzkI6QpqKbE+9LXjeGihRmwSedG5C6nFfQ9NuIXjzXO3nvrkqEHZm2zyzv2FMz X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 15:55:41.3417 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6dccb402-cb07-4932-7eea-08d65c5c7098 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2638 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Chunming Zhou --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 8de55f7f1a3a..cafafdb1d03f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -71,9 +71,10 @@ * - 3.25.0 - Add support for sensor query info (stable pstate sclk/mclk). * - 3.26.0 - GFX9: Process AMDGPU_IB_FLAG_TC_WB_NOT_INVALIDATE. * - 3.27.0 - Add new chunk to to AMDGPU_CS to enable BO_LIST creation. + * - 3.28.0 - Add syncobj timeline support to AMDGPU_CS. */ #define KMS_DRIVER_MAJOR 3 -#define KMS_DRIVER_MINOR 27 +#define KMS_DRIVER_MINOR 28 #define KMS_DRIVER_PATCHLEVEL 0 int amdgpu_vram_limit = 0;