From patchwork Tue Oct 9 08:45:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10632155 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 00CCA933 for ; Tue, 9 Oct 2018 08:46:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE5E328A45 for ; Tue, 9 Oct 2018 08:46:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE62928B74; Tue, 9 Oct 2018 08:46:55 +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=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 4C93928A45 for ; Tue, 9 Oct 2018 08:46:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 262E86E238; Tue, 9 Oct 2018 08:46:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0042.outbound.protection.outlook.com [104.47.42.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 40AAB6E238; Tue, 9 Oct 2018 08:46:51 +0000 (UTC) Received: from BN6PR1201CA0006.namprd12.prod.outlook.com (2603:10b6:405:4c::16) by DM3PR12MB0748.namprd12.prod.outlook.com (2a01:111:e400:5984::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.21; Tue, 9 Oct 2018 08:46:49 +0000 Received: from DM3NAM03FT017.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e49::200) by BN6PR1201CA0006.outlook.office365.com (2603:10b6:405:4c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1207.21 via Frontend Transport; Tue, 9 Oct 2018 08:46:48 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by DM3NAM03FT017.mail.protection.outlook.com (10.152.82.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1228.17 via Frontend Transport; Tue, 9 Oct 2018 08:46:48 +0000 Received: from zhoucm1.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 9 Oct 2018 03:46:13 -0500 From: Chunming Zhou To: Subject: [PATCH 3/6] drm: add support of syncobj timeline point wait v2 Date: Tue, 9 Oct 2018 16:45:25 +0800 Message-ID: <20181009084528.19184-3-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181009084528.19184-1-david1.zhou@amd.com> References: <20181009084528.19184-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)(376002)(136003)(396003)(346002)(2980300002)(428003)(189003)(199004)(68736007)(47776003)(50226002)(8936002)(305945005)(450100002)(6916009)(6666003)(4326008)(486006)(104016004)(54906003)(14444005)(426003)(11346002)(476003)(81166006)(4744004)(8676002)(446003)(72206003)(2616005)(81156014)(336012)(97736004)(478600001)(2906002)(126002)(86362001)(356003)(26005)(77096007)(186003)(36756003)(2351001)(316002)(16586007)(48376002)(50466002)(5660300001)(1076002)(7696005)(53416004)(106466001)(105586002)(51416003)(76176011)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR12MB0748; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; DM3NAM03FT017; 1:9eYXqRa8vLONicTx6lICjS9rd8FDReMxfbiUoYPGB87H53OSBaiYqRBeYgC40/i1S7eKcUZbCUOD6yEItVeqOur2RZbaj/Yw7eKX+TFmLwb3M718WJljon4U5BRf70ze X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1df02b37-076a-40b4-37b5-08d62dc3c04b X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:DM3PR12MB0748; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0748; 3:Jw0gO5LA53BiUNjowndCrFyG/kyttDihrCOu8juyFHOs1aNCr83q8K6Zn7H0H8CtAyZXMI+AzWrwncnDFzU+gTEb2wUFWNRTRBDQjX9gGA9cPtgzZuKOJzU3FaubH99JAO+ACIZ4P4fqAiENPSDBj02FCw2Bpk4CTFdmu8qM1G3WIO+5lNWhsgjSOww3IseX5vFY3OCZJe/yjdy8L1mWRUPxifcrTyuIiF9nMKbkITF2mgOQu4TUwkF+Qeq/gR+E83e4adD1Tta4WwGmCmxd0fCW1ge3/p2Pm4HA3ebeWrITGzp3mDgSDLndpAlURvQYfqp5N8uRr/sVCeMr4AFVFPVomLry7QWX2sMlqER66jg=; 25:0bwWEv7wt6oTodL4lUEViZ/Uj4SZddqpSKOSwP3rA1XYlz8aP/eC6NarGRvKMj5jjE1HiiOV5vlK/I1i7JgBH+Ey+MdA/xxTkLTLiQF6eI2xQxZ7Ziqtpee0kCXSK4amu9bSxh+R0HLFsuWs2693zR8hO79opl9XMSOPcsQljGpORpzvH8welJannM3xNmtfZrP9DfP+lAcJhl4r+8Bmk4MDiMh7UHvQDIyCO1ESsFpDIc/NZVtq25AhLpkeOjNouOo3k4us+ms9rPhOcpOkoZiuZn0BeJN8YCIgmgD3fcKUvqtIaBHEVtEa8gkvVRj3zv/JNgYMDcBHDgvaPqcsLA== X-MS-TrafficTypeDiagnostic: DM3PR12MB0748: X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0748; 31:6bZEl+tIEvbwtQYEOCbjvS3D5xZRl3+XWwhDYNWgIKrJ61cocojS9Q9iKVIICSbk484cFE2FCC9NjAR2XOpo//z+Zqb+J0p6EMKrnjC5IxSJF6jOBNk4ZWBf5neQ5UH7SLa759qLY79kaiq7yvdxuAmWYZFjzQ9h5YD4/muCH00gbbleGy6OhndXEFwQN0hOPxlWAn1oa7SPbGgG8OgxWbAVBUCIh+RrO8ftbu9iLCY=; 20:mK6b2v+EiOXxBKGyGYOlC0+pJWjNkrQ714v5/venTiO/mji0bBNxuMA+4Eqlck2yYfpzYCsfLjS8Lj2fJGrpYQNCMQ+84XqS3ndGQWfwjeNRVVQ8kvE1kaBVJbEslhiIZucPwV/X42u0bYsgIF/bbaQxjpLeKlwIxOuVmWbHt1xIC9pz8pWagW0kg1Hf8UF14vg6J8FNv3NmaNcoH6GLFmcrGZk4n6fWH726iNxRKjCGlavYcyDKqLpl9/5ThXq4uXpANt+kd4bbA5g8vXOtmVu9Ts53zHm4janJi+JdTXvTUleHGU/yyzwRYGd4Nf9PRDRTPSnK6NQRKQnbtIvdczGgi+EPkWEoR46m9prjIXvv2dRF04I6nPQ5f1v/qtgspJMM/DqRhNQAqDrtUX3InuC5H4plb+5cRFhSeTwPJVuyrznZRNN1+zip/QhjYHMw9uDrXmpAZLNR5Wk8iH24z2pU9w+S+MjL8BigyOgpCsjEeOk/RCwWvg9VlAicOwsk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93003095)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051); SRVR:DM3PR12MB0748; BCL:0; PCL:0; RULEID:; SRVR:DM3PR12MB0748; X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0748; 4:JcmJ8Ept/Y8HHaAPJ6JhfNMxCMrXxAkwArw5LAlPZ2P9F4/EeiOnHn0k8F/ImOs2S8S2GORciI/IR8KG4ZWfBL6T9MAC2j8MGpD9uAi+5W8+2rNk1yXXWAMDai5T2H/r6oDXg98g1Sw/uuoqxMAJYvtYXJMNI/oZenaWTRW+VMa86yB/YKW72FIdaIgPXhatiLbV25N1xn8D3Mmg3bHH5tj1EXHZE0Sz4Ic+F4X6ZfWKZcWIJHaxc80xPrJx3+voZiEt0JUIZVpSHyNGixrCZgvo4ltAZerQ6nQ1iuc3G7B1BpfnlRSjECqH5IgScSp9 X-Forefront-PRVS: 08200063E9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM3PR12MB0748; 23:4VDy4HaLy39z8otUUqMBIhzyQU2QuwnTH4yYtDGVt?= y2jrAREL3Jh8kLbxopZK4c8QrxbB2oxhSBQ6yBXVyhooUKtD+l0jAhpUe/85q8tfsvc8acxX6HTDuaHNPIiGPgFY86KcafE2M7kLZa/z13imUHB94qhLH2zu9e6HjGmKVOQ9nenUUfL/EWhaOPCjL/SIg+555ZDUaJKzNIANFxmA2OgflIxnWlqVfxXwSTpDq3ObCD9LEBODu7JCKzBNj4nPHmosbfDNFzyKnUEtwPvPsqUlFUVdXjcWvXP5T4fU0EXEjHrbxcPaAWdbA/4Q4CH/BnqtNM6DUDEF6zcyCusozX2EOMYXI9y5kg58TxarAj/h5OR/Cm9MaldHPXmWcmLMBtOJ0fTDNSyIXgcxtDEZqtzW+2v7YPeBVKSY2MBBrpMMEARZc7uYUc1DAxji0220ZDU37+7wDv6Td4TLG/2NSdaDyd4cPUKwVjTyoKygZ5zkiKnTJt8sf946M0JhbRDqmZUNDzED12Jmtcy2bc5HsmaQqg5QZKloKOtGs7KBF+MlNQ2b8H9r9u9088nr6ySM8QwegSYI5dxwQ9uIjrjSInJQBEkxsaiA607fvY25795EedgKOT+FyQ/vGtI2uMpq2uTQzzIaFHMZqGtw3H7zbpF1p7XTzAXZS59DJpbHY+Yn6KpsJyeE8baCzJBVEg8T1phHmlp+2cxJlUlQR/ZTUHTrcTi5NZLj0eDXSEFZ6yHtekY6KVGadRV8YRya1WeQAuVuHAvU7TgYTqbmFwRc2qk0Om3b2gLczkXoAS/FkSMvWOBLBF+QrbWngjyiGp47VixWMHkOdBw1FrTIvwjnPSGoVpRICRlgORJ3zZGMZsBfmO6KzqU672c1RwmsbXhsJbyrio5FLEa8bP1+1Xce3fZxOrAl8WIM3UOdAwnKTdgPb1Ch0dgyv7AxQ3fW6ChW2F3dUwHDKbe5t59X2H/fo+dlrhI2t30HFUBh9HHv4rD9p5MMCXXSxWYsYlBzUp05bgJh5xsWwOOSBnSHZpzBZudp3hYdq+U21zq8vSB5+H718w1pnhvf4DGP+DBzxwxCYeWnNdGGj/PPIu9Bnz6/sN2LbEcoOzx9+5ig0etUf69vbJ00xv4v/Dj5YJ6A2a8Y+2WsmwtMScoRETIyb7D47goAu547y7dRFSmnEFamD53CzAFxyomL9qpvlwhSniuzRjgfMbYsB6oqQyQY2ZwsQJFiREUWNlVgNmUnD8EssQ= X-Microsoft-Antispam-Message-Info: Vbvok0jDk3y7349hg8Tht0hijLs7dD2na8uY8U2zDXEckkcrQYtpeTb/YBIUFCI2g4FUlqAMpSuF7vQIo/87hBbrHICvr5ul6eqY6CqwFzGTDuo8gO1pWIiTmtRhx6/O3aFBYe8zDkGvnLZc3/WLr1ubydWg1rfpfSlbIev2Z1SRWcQxNr/xUfq8M0LZBsgCmkN+5oBkZ3iEHShEFmAiL5em9T4DQC180OCU+x/dZl3tBCv3fPSU4e4AXNMaKdPau1rHcY50i/Ut9kTI3zsy968+n1uZaEPKChJEMcT+McwcB77oICJR4llr7oQtkGGk70R90lzUQkTUWxntFoO9aFmAkrcAQi4HWwA0Z9N29H0= X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0748; 6:gBVaNynRzicJJz9cIMZEKQ8uckOKM1QeH6KLtm43yGA3rmqs1S500AmikXy5fF/zY3moXK8TTy0b6U/p80ds2VI2p7W+qWFXmkFgcxZnZMVOcEFaS5cP/NhQs+OJHbxRhz/yhQKfIG6w2RsScfGrpMP5rCcuZqFhHPsZeC94mzdNcsFKN/Po6mt8mJqNulDN8qxaoGi8KaFQRSzFte5ErRAUpctGaZCRHvdgiZoEF1t+ZOptHefkS8ZNGclfCSOBvObkRNn5AAgIr3de+2BKRY9T6m1gZm2F0YNfy4S33Hnrts+z7n8sxbwf3zJw2JmlBSaZUL3nKFg8bj7CcvBtlhgRMCQgWV39aVnaQzwiwdT0VNVHQ9GO7lOtzyK8VCjQIzmr86QcN7+tUiq2fk3y9XLRSVeAUdpvUTyLukw+ZxmKdsUaBaaTjyJKctEyjAJLWqaKKzJySHR7fAhBMf4vaw==; 5:sBn7ueGNI8nQBpBpCreZKY+oyOm9D6IehsIMF2vyheWYpzqfQ3OGM2EIBIU/CyEIkylmzdMzzowrZI2VyvDC/wTvYFvV87KeqAhNmkZbOKxr6a/v3+V3nBh1FmqXNpx52UaiaXuL3ZnP0ruB1HqXTq3+JXphUGsNkZFVIZ57SMw=; 7:x9vih1NTcs/9Oxq50NoFqPrfcvoZGEqNd5XQqXVQ+cVhFbwEiUVolnqLAcEd2hgew+KFHmmH/n8S9npJT4Lwz2IFaUmn5nyPoLSyzmX8zHYIIsm7e66Xv6bM4LQPCh3pV5fRvMxOX60L5K8KOkV+0JX4Jy5O3PfOTGwKk+rYtUWMZBf43X5BULqt2Cj1dWFY5viymMHfWWLfg2inpr+vePRLqRYK8rRVWBgaG12xL3tmHugL2g3CC46+v2Wvfqa9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR12MB0748; 20:Ibr8xEkHdbMNuE35OguNL1vnXiTfKqVNk1+2wCOEQ9YBvKH3HtZBvs8seSHU2YKueu+y15g0LEb+gC9iiDdynUdqUwgY+kFSx9b+51Yddx3firRSAVVwhl+q53xxadqJ6WDPp3U7eGkELp5z4g+YaG9Y1N6/vycaRaayaVMXQS1La/vrrJwN7k6iAPzcyjmpaqnBO6anb3nyju9JPOfGmqzkEDHK+UyXlvkM77/IpEU3XVKconKozrNJFx0ntbYP X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2018 08:46:48.5812 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1df02b37-076a-40b4-37b5-08d62dc3c04b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB0748 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: amd-gfx@lists.freedesktop.org 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 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 | 118 ++++++++++++++++++++++++++++----- include/uapi/drm/drm.h | 18 +++++ 4 files changed, 124 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 0c4eb4a9ab31..566d44e3c782 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -183,6 +183,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 6b4a633b4240..c0891614f516 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -669,6 +669,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 67472bd77c83..f3f11ac2ef28 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -126,13 +126,14 @@ static void drm_syncobj_add_callback_locked(struct drm_syncobj *syncobj, } static int drm_syncobj_fence_get_or_add_callback(struct drm_syncobj *syncobj, + u64 point, struct dma_fence **fence, struct drm_syncobj_cb *cb, drm_syncobj_func_t func) { int ret; - ret = drm_syncobj_search_fence(syncobj, 0, 0, fence); + ret = drm_syncobj_search_fence(syncobj, point, 0, fence); if (!ret) return 1; @@ -143,7 +144,7 @@ static int drm_syncobj_fence_get_or_add_callback(struct drm_syncobj *syncobj, */ if (!list_empty(&syncobj->signal_pt_list)) { spin_unlock(&syncobj->lock); - drm_syncobj_search_fence(syncobj, 0, 0, fence); + drm_syncobj_search_fence(syncobj, point, 0, fence); if (*fence) return 1; spin_lock(&syncobj->lock); @@ -354,13 +355,17 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, drm_syncobj_create_signal_pt(syncobj, fence, pt_value); if (fence) { struct drm_syncobj_cb *cur, *tmp; + struct list_head cb_list; + + INIT_LIST_HEAD(&cb_list); spin_lock(&syncobj->lock); - list_for_each_entry_safe(cur, tmp, &syncobj->cb_list, node) { + list_splice_init(&syncobj->cb_list, &cb_list); + spin_unlock(&syncobj->lock); + list_for_each_entry_safe(cur, tmp, &cb_list, node) { list_del_init(&cur->node); cur->func(syncobj, cur); } - spin_unlock(&syncobj->lock); } } EXPORT_SYMBOL(drm_syncobj_replace_fence); @@ -856,6 +861,7 @@ struct syncobj_wait_entry { struct dma_fence *fence; struct dma_fence_cb fence_cb; struct drm_syncobj_cb syncobj_cb; + u64 point; }; static void syncobj_wait_fence_func(struct dma_fence *fence, @@ -873,12 +879,13 @@ static void syncobj_wait_syncobj_func(struct drm_syncobj *syncobj, struct syncobj_wait_entry *wait = container_of(cb, struct syncobj_wait_entry, syncobj_cb); - drm_syncobj_search_fence(syncobj, 0, 0, &wait->fence); + drm_syncobj_search_fence(syncobj, wait->point, 0, &wait->fence); wake_up_process(wait->task); } 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, @@ -886,13 +893,38 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, { struct syncobj_wait_entry *entries; struct dma_fence *fence; + uint64_t *points; signed long ret; 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)) { + ret = -EFAULT; + goto err_free_points; + } + + + if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE) { + struct dma_fence *fence; + for (i = 0; i < count; ++i) { + ret = drm_syncobj_search_fence(syncobjs[i], points[i], + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT, + &fence); + if (ret) + goto err_free_points; + } + goto err_free_points; + } + entries = kcalloc(count, sizeof(*entries), GFP_KERNEL); + if (!entries) { + ret = -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 @@ -901,7 +933,8 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, signaled_count = 0; for (i = 0; i < count; ++i) { entries[i].task = current; - ret = drm_syncobj_search_fence(syncobjs[i], 0, 0, + entries[i].point = points[i]; + ret = drm_syncobj_search_fence(syncobjs[i], points[i], 0, &entries[i].fence); if (!entries[i].fence) { if (flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT) { @@ -940,6 +973,7 @@ 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].point, &entries[i].fence, &entries[i].syncobj_cb, syncobj_wait_syncobj_func); @@ -1003,6 +1037,9 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, } kfree(entries); +err_free_points: + kfree(points); + return ret; } @@ -1041,20 +1078,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; signed long ret = 0; uint32_t first = ~0; - ret = drm_syncobj_array_wait_timeout(syncobjs, - wait->count_handles, - wait->flags, - timeout, &first); + if (!timeline) { + timeout = drm_timeout_abs_to_jiffies(wait->timeout_nsec); + ret = drm_syncobj_array_wait_timeout(syncobjs, + NULL, + wait->count_handles, + wait->flags, + timeout, &first); + wait->first_signaled = first; + } else { + timeout = drm_timeout_abs_to_jiffies(timeline_wait->timeout_nsec); + ret = drm_syncobj_array_wait_timeout(syncobjs, + u64_to_user_ptr(timeline_wait->points), + timeline_wait->count_handles, + timeline_wait->flags, + timeout, &first); + timeline_wait->first_signaled = first; + } if (ret < 0) return ret; - wait->first_signaled = first; if (ret == 0) return -ETIME; return 0; @@ -1142,13 +1192,49 @@ 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_COMPLETED | + 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 cebdb2541eb7..c8bc1414753d 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -738,6 +738,10 @@ struct drm_syncobj_handle { #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0) #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1) +/* wait for time point to be completed */ +#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_COMPLETED (1 << 2) +/* wait for time point to become available */ +#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 3) struct drm_syncobj_wait { __u64 handles; /* absolute timeout */ @@ -748,6 +752,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; @@ -910,6 +927,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.