From patchwork Fri Dec 7 09:55:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10717771 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 26EA113BF for ; Fri, 7 Dec 2018 09:57:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12CAE2E711 for ; Fri, 7 Dec 2018 09:57:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06F0F2E75E; Fri, 7 Dec 2018 09:57:27 +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 D057E2E711 for ; Fri, 7 Dec 2018 09:57:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC9966E70B; Fri, 7 Dec 2018 09:57:24 +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-eopbgr710079.outbound.protection.outlook.com [40.107.71.79]) by gabe.freedesktop.org (Postfix) with ESMTPS id 478056E70D; Fri, 7 Dec 2018 09:57:22 +0000 (UTC) Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by SN1PR12MB0846.namprd12.prod.outlook.com (2a01:111:e400:c45c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.20; Fri, 7 Dec 2018 09:57:20 +0000 Received: from BY2NAM03FT049.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::209) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) 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 09:57:20 +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 BY2NAM03FT049.mail.protection.outlook.com (10.152.85.177) 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 09:57:19 +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; Fri, 7 Dec 2018 03:57:17 -0600 From: Chunming Zhou To: , , Subject: [PATCH 09/11] drm/syncobj: add transition iotcls between binary and timeline Date: Fri, 7 Dec 2018 17:55:59 +0800 Message-ID: <20181207095601.2058-9-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207095601.2058-1-david1.zhou@amd.com> References: <20181207095601.2058-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)(136003)(396003)(346002)(2980300002)(428003)(199004)(189003)(316002)(81156014)(8676002)(81166006)(86362001)(47776003)(36756003)(1076002)(6666004)(356004)(106466001)(53416004)(16586007)(110136005)(105586002)(126002)(2616005)(486006)(476003)(478600001)(446003)(104016004)(11346002)(72206003)(2906002)(14444005)(450100002)(4326008)(97736004)(2201001)(53936002)(50466002)(305945005)(76176011)(426003)(7696005)(51416003)(48376002)(186003)(336012)(50226002)(8936002)(77096007)(68736007)(5660300001)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0846; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT049; 1:ndW2ueozloaohf1VFidEmRw3Qpx6D5eKlrmjQbPBDYhioQY0c+E/dZLnHZ48AOp3xMtjJRsjhgye2sjZV1HouSDwyleKeBo1jaf/HO6LZvplZSzcePIUs+jYmFPswmzP X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7833a365-5048-4fa8-1cd8-08d65c2a607c X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:SN1PR12MB0846; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0846; 3:ZlMPX6d0AdBOp5Bz6BE8gjgCJwyHoC2IsEJFHsuecj3t6853m5UYiQQ9vPGdtLpfnWhx9G4TXPS8v9KS6U1IvLCPZ4J4lP+Cw0lO21YsEaZ9leR/24XkHw+Otoy7ENwlNLbm+M2VIeDl7FdRI1Kc7+Ao+EfTNRTuKOjEuV6OvUr3EtPJRwPoQh3pepA7dZy6x8N94MQJFsJpObDoGJaZ3e2hf2l5vTVTDCVHlKpu7VB1WzOyp2Q05Aut26acwYAuXuGIGIwCYzi5u9aW2/queYDmT3YQTyP4JXGfou4Yd8Bd3KzN1WNOjso1XkDoFv99U3x0w95GsxwCBrBNvopdrbK6MrIzyihmuOrSLNrplcs=; 25:HNI8/JoFDsq0nFms+ByW709EijQRvjl1UraP7d41bbO5KieXnDbcgTFOOL6yEU2XEjHaHufnlx0E0mCvDHX4jlGfrqfzzx9m3kMBC4GcpkkgLUWLsLVa4nfH1f6+L7oIpUya/N0XyRBR56++gsdt6yxn+lcSNDa02BAvpreh4Dinf2nqlMFYfbqTLyuqe/acNLh4YfaKUeBsf4iV5rk7w5M6O9RJ7huCnV4HOroIc4HgSzAcmZmJ9q7QRLsF0v06+8KPgk2Tdfsvs/IoM21Bdo9mxqrcDCIV1smAGhyXlvAq5vjQymJjpgDeihY4M0MisPMrmU0esZnq5LwHtPhf0w== X-MS-TrafficTypeDiagnostic: SN1PR12MB0846: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0846; 31:VIlzXl48jgC/uD6nha8wxXSS4l/rstilQic4zZwXaNbVDM41F+RddVvIpeAkWm44dFNEfrtY+pt2+v99xL/qRziHmIG7znfCssMReJuVWwZ7M2xw/EUpKfziD6Pw2n6ro8kHY+dVokz2krz2amrkhDg2cHs4AZgm4xBsRzjEPbZACPLcbHjx7T583ORp4Ajw30EXgLQdaZIZRfqeL20POoDrt6n2ys5UHvj4ba1jqos=; 20:hjEbcjdf67EgWS1xIk/fg+12sks7YnB6fYrVVyP5sIhjSyB8LPf0HHEo5CZXnxxK1c1x7r/tFuKb3iWKaxA90m6PiJ7TbaPEIzPJ5bvRJWSsaafXPPZNVjcIeTIU+uLHCgLmcAvepyIMZwD26lCcXL+9l018isNndZ1nelLEcPCCP2uloja8i618Je6nOPackuvXNvjTRNfMNIzjv4dadtEPc8roQjjULQHfV962SoOzmfpOEgppRBII0T9BZhVMrC9raGGpQ2dR9o6OCYgYJ0oXnc8gTtf7md9gEG81n7yYLCDvgfjTiHPEPxpIfUc6HsU6vJvwlQxQOaP6YWx0r1/pX9b1d2Ug35NZhRj6tMhtM8LfYuLxApCKEUG8ICtALpf3sUKum1sYKKyM+x51VeRBfoDczAZ1xEEdD/TJD3P1/H07pd3y90IcfpaMNRsy+KzSDbyoBKEb0G1d1PYvLC9rMCPJYm6BBXIUnF4fj4ferFZ4HggriJTX5Nkd0cln 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)(3231455)(999002)(944501520)(52105112)(93006095)(93003095)(3002001)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:SN1PR12MB0846; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0846; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0846; 4:bHQ+Gw0wRDxzqioO8fmhbxLhA3CzQbRGnhq8SBmYH+nuEKsG3JsqHozIyu3tYf/DcV+4Q44ydLNodd5xASHY+SB/ybaYMIjj+HgPZfahaQCbgUCXiEGWJ0Wig6nEpCScKjwc8Ycf6ybsihCGCJMobqeXr1ELtb+WalupTF8WoqItGsG7C38Ii/x4k6VqQzi1PmE1is/UdvAjJR6eX9kI4UH3lCngfIQDe5+zrmhRPhwkZ7ogpEo23GBiCohZ5OWDJ3Tu45cX+4gu9g7nNCf3bQ== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB0846; 23:sZZjTtVI0bpVYV3QpKBcRRPL7cxltv5OeOzbRN9jT?= n3pPhKV1uQ++y5jguOUpHtZegOJ7oY9lBWVdk2JyIdIvxd5kIlAlN2ZQrBb6U2D8IJCH7Z3UcxEjz/HqGek3qQalf4Ca/7O9FzeWT5P5LLKafdAe6/IRA8+5xf65vyqty2yPTpS3uVSYT/cHxtwHyNaZgS+BPslOtqEfuuV8pMI/EthDOOHUiV7LOYMudvGbPgGgmXkaGPUSaEzZ1YBjTz6992RbQ0kpOVv5QlcBxLvTXcVC/BrywKbwQDeMiVOJCECcQppy7NSUjB/5imi9wkDFmk2TrimiUL+bF4SC4llGEveD37Su9ucIbCFMdAC7LHRYDAJREMIug3BQHGlm1PwIUx3NwV+q/B++qcKi5ypN8/XiPiDoN/i5uFXjiQ+/PfpmrY0xn1A7Yw+SiK/75nEgqBVjTqb7vs1sCmt1OHWkT+rWDeNhlCpguyKjBnfVuMipJqmZhik85lMe2GkyV5rP/zcAZfaOIKoyDiKEldmy5Kli67YRJ4I5OwqK5fm01hr6+tIipt1xZHKAq7F/lw7HF6ez98ClAGu+VM33KCVsIY1voKMSM39tTXFJAtuBVmM6hbmg8lQTauuO/XxZiB3dTK450X0TS8vPFoMK2qTw7VaCy73FDSOoGMEctkNHTb7YtG4S5MVaxO/IcpBLauXmuI/ks3wFgtidpoe62Q+ZJviKOMZHqsd7PJ/SwuuM9h/7tDBvyqqru0JY+mjfPxhYpjBOqCxZBpUbHe7bPTY1SnPHjf8u/YrUWD7lG2UWITD3oSgQRrk+WTn9gLWoGhSgqRnhHt6lqMgdkmDb+n1qhulgqHggN8pPuizCkorWA4PS3IMhjs1bp5FKxKwMJV5Ter9LvNlByjqIqZ5DqE5EBP9HQgoEOsUXyZlmW+pgSsSbrhyp1kg0njr4/oEoKHrfT+WQ6Kyv5VHa6kEx6LL6t973sMEtsZU3SU+QIJxqbn2cXqXBG8/0HGb9tssbH5kEDRWKwAIsiDx9+TLeJ+5RbsHI+LJH8lTvXTFcinDEc8CB7oF9J8cm9FCdYL3K+3T15kiC2va4+jYSyTmwhPQmhRObsIgJb8D8MZ0EMGTWiJxdlxoj/YK9r01N+89Z3rU9vXZ6o1jm7JVQQCf7YhC6Z3lz3nIY7JOamL7699+QqnTb+J0rfasG/pMBO/Q3v8f X-Microsoft-Antispam-Message-Info: Yrdlgb7VrP+WKNAnf3vk3uOuSn/e5LS7L4JScY+7sk2HSQ+WSAMUecdA4leN8o6EszVsb7JgY7x29B9NgEnF0K4W67XKlaTwOQIMyBaOpWZ7iplhrBMyDcYQpTSu/FevpymlLuL3qd8sR5HUyd4RL1d58XtwvpmYqZK4oR54tKWVvA+q8848E683t5U9NxoCVMra+qaZY00lbfmm1q3nOa5x/v+uEaVa0A4QlxZ9ca6zh5RySFn1zqd4RBsgsVFsjIJD9RCfITuzuUeIduBbPqsYIp4Aes+qWa70Dm0kmjYcb5M3xG3BuxRx+R3W012mEVUIPuLx8L1xlWNlSZUr66s4wW7R+4nfqFz9Dado7XY= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0846; 6:AcZ7cIafyh+oAQwGvZzKqB7FZqtvne/md9Ywmsu8VBJCI0BAOe5s3CfqKJs06ZF44WMrJO1Eybu/qwbS/qTNsPhfOZYWjsP1I4tUs8IeLAOhAdXX6G4TEa3yW6C8jMYMDYF4N3pVIaN0H3TLi37ahMFZpHNjhrEQlrVw6J704zKlzlZNAEwzrbCrA/REopAglphtd2GqWb4SWa/GFJ+jeoSir2Y2fTm2rjPFpsMjgDvrZG91jfcx8Z46uAq1Xm3iTMYgm+FF8PJLRPNiZxC79ct9hE2kHak8bACW6NdDBV26QLiHI4jkR3wtHbrwZyC1lydYff/UH+rjDGDqtHF4H3m7CUPKuMysIU91wjX2KoBZRO4uWf1WFwukiCtHMoKYpTZxY46YkuTUW1g3Ef894PF4KobqT08f3SyGYpngWa483Mfeq0sDX89OzPIUw9zEbdcz3VWgUIMH23b5XYPUpQ==; 5:3PqNCl9jK+6olHvjMbxJu9FAsCE0f6YoxAfP0QaPQB5VHuyKpPWiNTzqohspVpqtwDyASZ4lh73wDACJSKzRHD5HOSldWZiLiledMcw4Mwz2+2pl2NtR38pjJ9IpDwSMGAFjgTOSNbFXzmW1AMYMRjkjCD52gMexYTS+eCThjLU=; 7:eeJjHxl63+nxa8h1wAWKvQc3lZVvtapKcUMsIjXeT8xSgOOXZPDxLFbmvKMdpbTp7wilXIKmpF+lHKn8zX/iQMXDFQYm+mk3FamRvRqSwz0KdAzSBmBswieOwvSbTqfPKsKAvh0WEDqKO1Yrzn4Gyw== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0846; 20:3q5KrN9kmYa/TLcMyqSWCr3ZRBsLEoECMKE44ZlFYtpvg232jeQ8RGt3C2uVRQCUnQzCs17vJURAWo5N/Clf/mfDKPmZ4kqajVLlDqEKSpOAv2RP2JkOXyguY/b4jd8SOxNxa3AkKqbmOfY+pmYxaYvAjozBH+3VJVTFa++td1r7hvpvNQT5sZgspIfHfuwyvCK+WNNeQ9ncQhy68C4yaVaEjr9haPDP0Kxub/xQmsv5MX1GKMwaSYfpAxNANdX3 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 09:57:19.4600 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7833a365-5048-4fa8-1cd8-08d65c2a607c 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: SN1PR12MB0846 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 Signed-off-by: Chunming Zhou Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Chunming Zhou Signed-off-by: Chunming Zhou <david1.zhou@amd.com> --- drivers/gpu/drm/drm_internal.h | 4 +++ drivers/gpu/drm/drm_ioctl.c | 6 ++++ drivers/gpu/drm/drm_syncobj.c | 66 ++++++++++++++++++++++++++++++++++ include/uapi/drm/drm.h | 10 ++++++ 4 files changed, 86 insertions(+) diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index dab4d5936441..ecbe3d51a702 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -176,6 +176,10 @@ 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_binary_to_timeline_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private); +int drm_syncobj_timeline_to_binary_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..6b417e3c3ea5 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -673,6 +673,12 @@ 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_BINARY_TO_TIMELINE, + drm_syncobj_binary_to_timeline_ioctl, + DRM_UNLOCKED|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF(DRM_IOCTL_SYNCOBJ_TIMELINE_TO_BINARY, + drm_syncobj_timeline_to_binary_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..cf4daa670252 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -670,6 +670,72 @@ drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data, &args->handle); } +int +drm_syncobj_binary_to_timeline_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private) +{ + struct drm_syncobj_transfer *args = data; + struct drm_syncobj *timeline_syncobj = NULL; + struct dma_fence *fence; + struct dma_fence_chain *chain; + int ret; + + if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) + return -ENODEV; + + if (args->pad) + return -EINVAL; + + timeline_syncobj = drm_syncobj_find(file_private, args->timeline_handle); + if (!timeline_syncobj) { + return -ENOENT; + } + ret = drm_syncobj_find_fence(file_private, args->binary_handle, 0, 0, + &fence); + if (ret) + goto err; + chain = kzalloc(sizeof(struct dma_fence_chain), GFP_KERNEL); + if (!chain) + goto err1; + drm_syncobj_add_point(timeline_syncobj, chain, fence, args->point); +err1: + dma_fence_put(fence); +err: + drm_syncobj_put(timeline_syncobj); + + return ret; +} + +int +drm_syncobj_timeline_to_binary_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private) +{ + struct drm_syncobj_transfer *args = data; + struct drm_syncobj *binary_syncobj = NULL; + struct dma_fence *fence; + int ret; + + if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) + return -ENODEV; + + if (args->pad) + return -EINVAL; + + binary_syncobj = drm_syncobj_find(file_private, args->binary_handle); + if (!binary_syncobj) + return -ENOENT; + ret = drm_syncobj_find_fence(file_private, args->timeline_handle, + args->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; +} + 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..88d6129d4a18 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -735,6 +735,14 @@ struct drm_syncobj_handle { __u32 pad; }; +struct drm_syncobj_transfer { + __u32 binary_handle; + __u32 timeline_handle; + __u64 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 +941,8 @@ 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_BINARY_TO_TIMELINE DRM_IOWR(0xCC, struct drm_syncobj_transfer) +#define DRM_IOCTL_SYNCOBJ_TIMELINE_TO_BINARY DRM_IOWR(0xCD, struct drm_syncobj_transfer) /** * Device specific ioctls should only be in their respective headers