From patchwork Fri Dec 7 09:58:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10717787 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 79ED313BF for ; Fri, 7 Dec 2018 09:58:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BC7628906 for ; Fri, 7 Dec 2018 09:58:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CBD4288A9; Fri, 7 Dec 2018 09:58:37 +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 B368828782 for ; Fri, 7 Dec 2018 09:58:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC0C06E713; Fri, 7 Dec 2018 09:58:35 +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-eopbgr710087.outbound.protection.outlook.com [40.107.71.87]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E30B6E70E; Fri, 7 Dec 2018 09:58:33 +0000 (UTC) Received: from BN4PR12CA0016.namprd12.prod.outlook.com (2603:10b6:403:2::26) 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 09:58:31 +0000 Received: from BY2NAM03FT028.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::206) by BN4PR12CA0016.outlook.office365.com (2603:10b6:403:2::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.18 via Frontend Transport; Fri, 7 Dec 2018 09:58:31 +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 09:58:30 +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 03:58:29 -0600 From: Chunming Zhou To: , , Subject: [PATCH libdrm 5/7] add timeline signal/transfer ioctls Date: Fri, 7 Dec 2018 17:58:01 +0800 Message-ID: <20181207095803.2155-5-david1.zhou@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181207095803.2155-1-david1.zhou@amd.com> References: <20181207095803.2155-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)(979002)(39860400002)(346002)(376002)(136003)(396003)(2980300002)(428003)(199004)(189003)(446003)(126002)(16586007)(2616005)(426003)(476003)(11346002)(68736007)(5660300001)(47776003)(81156014)(81166006)(8936002)(7696005)(51416003)(76176011)(53936002)(8676002)(50226002)(450100002)(316002)(305945005)(486006)(110136005)(4326008)(106466001)(105586002)(36756003)(2201001)(97736004)(86362001)(50466002)(77096007)(478600001)(1076002)(53416004)(6666004)(104016004)(2906002)(356004)(336012)(186003)(72206003)(48376002)(26005)(969003)(989001)(999001)(1009001)(1019001); 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; BY2NAM03FT028; 1:IAPMCYLefZoGlt+0CBBtumtUMhB9GX4qAopDW2dO9dG2wwqT6LfpN4fkUtdpF9CaVIR5PwVp9Befh5g3me/sUoYvE515cOjux9BDP/ZxRApCF0QpJ/82pR0YnvWYJHUw X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 933d970e-1922-43be-a7bd-08d65c2a8aa3 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:yD0f3Ncxj/SSghNkT/r0IJXxUP8oVpx49sVeOi+lQTzz0jpHfEs5BU0gcoROLsnWBK4EGlxKzF1ac2KCbtPFqX+6mp5t+5j40mXW1O+8ZiZnRfy+1JLzGhOFwoS/7+GWBcBj44EuWbcnsPt86iETT+ctllq1ohXAkJ3hwkJDXz/z/N/X2NjrEmNfVvnMu2rvJ2r+aaCX37CzP8lesm8dL/VdxYPj6jZ6TCVYhiKt0cYAQhzV2fDf2ghhzG+jc+iI+l8i4rJguISzO1T6jdQirJka/jg1zlXUXbk0Wy5HtVsmrLeCb/v6EU7rz2YibWw3SnIL5YC0jYEi4PWZv12DOkeW3ebpmAsN01prMsiH/ZY=; 25:nTSjCUBVfjhYE/eW7SCNLnhC8wpBMLqtBtpA3yEx3mYX3MYP3kkEDh1ql/sioq/TzsDsJ1tzFdueZIDG2w7xhKoe9GIPcEkdi0PygydpvXNsJurDvFt3VRauFO10FzltJ4Y+jRKeVxWN5ZcFaP5bHvj34Fc/VQv+QSj1/0/uQ+e0DyI7Kdkv9ta6noLucpaC+QF04fwt4fps0Oaufarj2pBIs4+/O9N16nC84BX5/Gu99SWAUno9xRcQS5UEHzXba4NPrVTwboToe7sL0CZUgr1korMBss2l1hTmLbWt8+tfuDWS0o32TPBSXy/R+qkdvZuqm3+IL+FyEZ9WaASJxw== X-MS-TrafficTypeDiagnostic: BYAPR12MB2632: X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2632; 31:vujjgLexNyzEcRnzt+GmMHaeUnj3QqEh9YbH9AiFDneIbIqAePa8VryJJVFJEqKX/UgHT3LO45t/sZ4FLnsyK4B7eECRGzsEmXpVtDS/UYM1KJnVfRrj9YY87dCBQEIytOznKmvoJ5eKSe/0YRER1zm1+Hc7wvmQQHoUm+nLDjxwo571yWjTGhCObDJeD4yoLnnc8HPr1u9vpVVc5i4eVf/YvCMC8+beeJjjv3UqE3s=; 20:CiQMC1gV4BSIjgRaA13dBhYqMwsGYS/ihZOC1+4UdL12OdkKJaVKv1gK+7viYJT2GJZD6vqIb7w8VLpSmuJ8raAZNgyMhdOabXZ9Sl4XKKM3axvx5e66sgJef17lsfuBKQobuvSsWKEUZngu6JVwlfqO2Laycbk9JbFeYnee5b6Ri+fkYebYabVmDq0crTsMwpEmMaNF5zIF35Nf3NLvp+Hqg+7FqLEGbXe5zm1Ln1XAvCKGNQsnjf2U+OJb+bXbP4ki7Ijc8c3DJ19a009t5QnNiX7QOkZX21mO2fMJL3EyvyJRN1Kp8ZRYyR1kaScGRVWo9UuiThf6qYcf9hHxZ5p3QHMcjZRgSCz9ov6ZR+OFzIRm2CpYdM40yHSbiPcA46fQIXFydtJCOWypo9OhoO5aIuoTsfNWvancaTlThAyde1Y/0Mfants48dyEluYSrd/z39pwet2+wavsOPLzMB1TRCqQPxLP5ilc1GuaHOd+6H9j+7Jit6jUFS2oU10e 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)(3231455)(999002)(944501520)(52105112)(93006095)(93003095)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:BYAPR12MB2632; BCL:0; PCL:0; RULEID:; SRVR:BYAPR12MB2632; X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2632; 4:Z+xFAhl+SGtsVJ34xVLePcFwHcmJFOgdaZecgoAQ25auUBfeKO25seb0bWCAn14MPuX8JOfzhrCd1v0jKW/ZdL3VbN6rpeGI472qSCvaw7rVyUp+4anUBx0Y+RNsWJBl46bCTrS/uA66yMVO2QCWUtbB1dn6epDLfyMjIrDctLYZPjghk+OYfWxe6tMs1DgLwxEnezaQsqNlbaplxu2YsVUWkp0KNoD0YetY4u0rZ96xI2TQIpu+y6GkYLgpOyLB+7NSATHpBR5kFS0fDyeXdA== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BYAPR12MB2632; 23:/oTqDby4cO2QA3nc5UXdqEkxVdnj12515L09Phyny?= ArPFEa6wm1XOWy+zZel/vrKBH1lkqV8ZL5i2NWHm/41xmyd9dwJBSfNnLzI4N6QmHB472piPqE3+AYXTE5eoThg+HsfPzj2kgXqjRZr+H6/vuCHxed0VaQQzz1XH0YViLT7+cK8ol0GGLQjv54X6+3aQ4aPA7xlbR/eztDa8kG4EtkzP1cXgqepk0a+gtkMYPAwlrc1yvG+hDqA/8wpbLHa8/ft5XvYmlTeXPS0CfWiYMiUFRC9kPQZE5xfgf6piv8rYUCZPPme8niJvT0yqvs0aFRN0d8n/0+ncyA2oXEZ6VirGQ49CCwoQN8WpVyfvFxD8wBhe/4rIIYXOroXZG1uPveeCETMrHWIRHPcRXOztWDhzTPJv4acBPd/W+zDu2lrAm0VGHulAu+5WH+4N/Z1pL7UN0bBBZC8HjLSGX67WC5PXoIqsAlNKyNsGr7HeEnmc+Z/vhco1wRSr9QpZXU3VDaARC2kZfVCp/HEfLNJZixWIFKFD9cqECo91B2Z6lkwX/KChxcaKoF66uPhDJNksGeRnOc9A0Hek8VoDEVzmc7Aq1oPV3Fr7/HB+zeMbz7usmF3jvp7R780MwxuzK5qd9jQoQ9VZlq4Bxhx2xc5KIni+FIKWUCK4DWHdNVJFqpgokd+Irc8XDsMV6v97/QN22ThBurS90hQTmQNin6j00Xr09yqFpHz1H8AZr4xvBCAerGF6/fCaOTLvNUAabmOR8uh3uXVXHN9GW8DKJ23f2fyLVcRNn3u1ycZU2MKEWY+V6gddCC9qgQsJrSJ9gzAuAR06xscBj5vAEjiDHML585m2OVu1GNhb79Zf8UTl0D2l+jxdP3bzUi/VZ34UUAKal1mPjKuWZCkrz0SoyeYAp/leHIpVuIbQldHPKB0qUiZbeOtSopXq7tNGnXx+I73IoEIJDMha/oA0dZOhqdES6l5HEj9rfEgMpJogGEQZqgzm3DkCMNgsWUU7TDdWYwZeoS3zOGa7uEdJZtqfZFlIORVS46fn0uQXBGmlEL9DEVbv3JQsIijt5FOxwmYPVvaKr7CTpExxjOSbxSHhVcOiCU8V6mhpoB/TMMyBgMBGOjtHMcPjfxg8QAI75fP48a3mXLUwmo0GNZG3fC3ZnMRxF1/sqeHFEENRx1ffM1QLf9lGglRIDHlGQi5Fz+JlXc4IMqJ8UW6QvMBjmTkewN4Bn3nPk98WO1qoZCDvXw7iUFK/TcXAbbQmnUkn7A7shy8WXeHU5Pp+uBW6QUrcBFTAQ== X-Microsoft-Antispam-Message-Info: LVon1Oel7UqCgjXuC98k0MD78QbOjpiPQCo7QvikjkFK/aYWvvbN4rQdleUTC0zi+hrz9VZZ+5O9Jjfg7/TVT5bFLXlDX3AmaH1BXByhw1WWhiiax6VcUNwYI9yGmfsXi4+lvRK1eGVU8HlntD/FGXvR/LT3g6Hj1jTBAWL26ucXxTEgmUAgTSMQ6wm77q7dZVVHCgrUcO1WtHSxpS3li/Li1oO0rN3Eeh1JGaERWyqDpnqKxQrECJSNBq6+9oQ+AmORxk4cYQcMm9uLzEKPaYmH9PIargh5II2Ff6upGWKS2XPn9raisn1z4IaosOdePBZ94fNa6Bp4EK7+w8wQE/AYUA4ig4Upv/fWXogYls4= X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2632; 6:EW1ME0zbKyMBAB8RBIVEtn3Lsgxn0bMYY3aJ3DIgAxeyK48gc/up0MTAmNtG9hEqB8PGv59mUjZCfMYFAX7i6eZfi7l2bBhunIhw5qDaQDVHFfol0w6T+pgbWNUH2Qrvbp3KOTzUFlhMiMRDeXxwonwrf7Aox621SwhXAX2w56gljMyR5m+XfRFRGFKsauhn5sU/RscbuVN2cJr0ZEfvAu0UIXRA0oUzZXz/aVeQLUCtmDzAgHgaY5F3/V7/a7Kog4rH83chpl6fMH1XfxIflSQm2B+zjvpSsIvms5iV6Y6anZk2z+AjDn0z/cOO8H2meXyPffTIEo0vN/WSaBl1Bbdn1YXX78S8pRb3a53BUOwMZRIaPrKL8B7Au6hDGzVdNefitpnb0hAs1m0I9NHO1aywDySDqrnN95S+WKFJa7nmX4T+LbeIopfCO1Fi+nRQywz791R+VjN6YDje3F+KDg==; 5:o9Nf67u6ESieXMCpGpPAh39n6iLHC9w6i8LFxOrS+d+EDwjpgZcThu+Lzjb/niHgqiSY+rFTQDWBjObGbARbbhVms+4KKMWSJfgnlneMJmwWocL8qHUDp1BZItnIdbPY23gyLKH/Yrjn7254zJvPRZXPufT623OmUv7hCXlboJQ=; 7:uqOWRy7KjHSbiVdzxLPITx8PazW7MAJgckTUaHVvDG1rk/OnVd6bD6e5s0wWRu/anAlkJ0qSUd6nyfqZBRm98z7+BXyzrQKIeNpPwod0aSnWvUX9CZhGy6JhZlC3SN3EPsdn7nxmfOysVHUSqlzAVQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR12MB2632; 20:QMBGHcxR5vwUgm+AVJQNqlPGIenXTZBsGMv05x1fhe7n2LzQlqf8c7fmqavIEXALRMoEquW/fR0ER0s2l7hys1sN/7xn6lt/FfJffJ7p5FVBNSNwN8pJDvZdOUpQrXlmHBXnncupxf3H/iY01uiNjgi/T7oJVCtycFJqLXneQG7q3C1EItxZjiFcOwa6VDNQamWCTsILjqJJ25j+lsZkcHUuivRbIy2lRKonPVhXVOE8WvepVZAJioCVCxHI3wzb X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 09:58:30.2147 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 933d970e-1922-43be-a7bd-08d65c2a8aa3 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Chunming Zhou --- xf86drm.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ xf86drm.h | 8 ++++++++ 2 files changed, 57 insertions(+) diff --git a/xf86drm.c b/xf86drm.c index 9816b3b2..9cf01d38 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -4278,6 +4278,21 @@ drm_public int drmSyncobjSignal(int fd, const uint32_t *handles, return ret; } +drm_public int drmSyncobjTimelineSignal(int fd, const uint32_t *handles, + uint64_t *points, uint32_t handle_count) +{ + struct drm_syncobj_timeline_array args; + int ret; + + memclear(args); + args.handles = (uintptr_t)handles; + args.points = (uint64_t)(uintptr_t)points; + args.count_handles = handle_count; + + ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL, &args); + return ret; +} + drm_public int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points, unsigned num_handles, int64_t timeout_nsec, unsigned flags, @@ -4320,4 +4335,38 @@ drm_public int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points, return 0; } +drm_public int drmSyncobjBinaryToTimeline(int fd, uint32_t binary_handle, + uint32_t timeline_handle, + uint64_t point) +{ + struct drm_syncobj_transfer args; + int ret; + memclear(args); + args.binary_handle = binary_handle; + args.timeline_handle = timeline_handle; + args.point = point; + + ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_BINARY_TO_TIMELINE, &args); + + return ret; +} + +drm_public int drmSyncobjTimelineToBinary(int fd, uint32_t binary_handle, + uint32_t timeline_handle, + uint64_t point, + uint32_t flags) +{ + struct drm_syncobj_transfer args; + int ret; + + memclear(args); + args.binary_handle = binary_handle; + args.timeline_handle = timeline_handle; + args.point = point; + args.flags = flags; + + ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_TIMELINE_TO_BINARY, &args); + + return ret; +} diff --git a/xf86drm.h b/xf86drm.h index 49a40633..1b7d8a32 100644 --- a/xf86drm.h +++ b/xf86drm.h @@ -875,12 +875,20 @@ extern int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles, uint32_t *first_signaled); extern int drmSyncobjReset(int fd, const uint32_t *handles, uint32_t handle_count); extern int drmSyncobjSignal(int fd, const uint32_t *handles, uint32_t handle_count); +extern int drmSyncobjTimelineSignal(int fd, const uint32_t *handles, + uint64_t *points, uint32_t handle_count); extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points, unsigned num_handles, int64_t timeout_nsec, unsigned flags, uint32_t *first_signaled); extern int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points, uint32_t handle_count); +extern int drmSyncobjBinaryToTimeline(int fd, uint32_t binary_handle, + uint32_t timeline_handle, + uint64_t point); +extern int drmSyncobjTimelineToBinary(int fd, uint32_t binary_handle, + uint32_t timeline_handle, + uint64_t point, uint32_t flags); #if defined(__cplusplus) }