From patchwork Fri Dec 7 09:55:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10717759 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 8EC2413BF for ; Fri, 7 Dec 2018 09:56:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 791762E700 for ; Fri, 7 Dec 2018 09:56:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B38C2E747; Fri, 7 Dec 2018 09:56:38 +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 DD4672E700 for ; Fri, 7 Dec 2018 09:56:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 224C36E6FD; Fri, 7 Dec 2018 09:56:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750045.outbound.protection.outlook.com [40.107.75.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19A176E6FD; Fri, 7 Dec 2018 09:56:36 +0000 (UTC) Received: from DM5PR12CA0066.namprd12.prod.outlook.com (2603:10b6:3:103::28) 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 09:56:34 +0000 Received: from BY2NAM03FT003.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by DM5PR12CA0066.outlook.office365.com (2603:10b6:3:103::28) 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 09:56:34 +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 BY2NAM03FT003.mail.protection.outlook.com (10.152.84.105) 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:56:33 +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:56:29 -0600 From: Chunming Zhou To: , , Subject: [PATCH 03/11] drm/syncobj: remove drm_syncobj_cb and cleanup Date: Fri, 7 Dec 2018 17:55:53 +0800 Message-ID: <20181207095601.2058-3-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)(346002)(396003)(136003)(39860400002)(2980300002)(428003)(199004)(189003)(5820100001)(36756003)(104016004)(476003)(8936002)(81166006)(2616005)(8676002)(81156014)(14444005)(50226002)(126002)(486006)(105586002)(68736007)(50466002)(2906002)(575784001)(86362001)(2870700001)(1076002)(97736004)(2201001)(106466001)(53416004)(54906003)(47776003)(23676004)(110136005)(5660300001)(316002)(7696005)(356004)(11346002)(446003)(53936002)(26005)(6666004)(426003)(76176011)(77096007)(39060400002)(336012)(478600001)(66574011)(4326008)(72206003)(305945005)(186003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR12MB2638; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT003; 1:GV0tbU3dAwIA7VnqdYBk/X8Y5EQS/SeYK5IYT1+ekyKJYs38awITitA3e+IhQyuWm4zCAakBr+8eqA/eZHzlzNnq8yijnpJSPHVcxObpdapmiXihsTCs61DtWQrSWBDX X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 72b46b11-aafe-47f1-c42b-08d65c2a451b 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:6UeBLvoovBzDbjs6fOFzcJKdCd/1GmEAZdg1iWcq9EpDOQ87aKEkvnosoP3I1ofQ5ttRcakdevUgvO2SVCf6iVyJYpIb73vr+bgGYbcl/juvdaqLeEqdnOUtXhRf/npT4bGcaMRyTBtpAYOD7HmalrJpZMx0lJKW9b3hNXVamtu8cYqPIfsq7HDZjowQmn4HAgmM95UNsCC0hbsBzNkAIKUlbH2VINCbMlBkkM73J5jhwLMhrDSwqp8lGJozWObyM+tKafFn2SWA42tAJqgN4AkTafv1s1J2ThYIYLK3RfO1XXzPrx0DPAobV8kXn24ji+7VHIYE5II5oLlKLoKczNIhnO5jQR3132Ow1kAxz94=; 25:+Io99ufXhRAglYppkr2TIo9u9K8CvsL+TY4gh16fjyi6XJ6TsyouRA7vbE+Vxe4O3E7lZ/WTGG8SqVQr3p8sdS/giukN8xDQrgSbNP2zHm6rpUNgGEhytYMmxBpmEpZh024yCiJ04YOI8RdWMg5m110O+h0ltxyQubwP74lmk3u8/L+rKYRNW2CJnZ1uosWa1tQ5sSnAwankFL2HKAhGRrjAHZ8frDV6E1sVVu7UxYlcjWXmfxNGRcxasfNz+hhcjp+L4cBx2LW6Dbd6d9A2ZDUkcZeL32pRoOCK4RQpIkBNy717NuCe7EI/p3IFDgysXfrnBDMS3ax/5S6GKQeYlA== X-MS-TrafficTypeDiagnostic: SN6PR12MB2638: X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2638; 31:evA8dOy5ZGaNicY11ke75R+WIlRRCAEFtmL+7ebJspsGV/ZKk5hIGr2gX4jxpOHHUP090UzGEk1GwZcoU1ekeNKDazbrxbLbpPjTDwLMI+AWwDnflB29bts0Iz0NHYc4anLeLJcOQuiVZRW52PKCGeB+RC7UiFXLaLHrGrcyVD37G5pKC+IzVMdwFCXX6KMgSaTNepI1UUexduFXwq7nNa0M1GZEepVQb+SwSiIiRU4=; 20:a2T8eiXsU/d2B8qFijLkJPeglGDjtOopiYI/W/JydcF4PGEbYJoStEL9sjYM1BVrqTfb0pNSJEjdTKZKkKE9/iZxuxOn/Yx1j19AIcEvpTUnwh6bfOtcRw8vLAYJYpjjLpvxQGbnDB0VIm2eWg3Q0MiIkuUs+kBPS3wiBldeVXwwFNkWRB+a/m3c2CRqIjk8fBqhgrQY39+U0I1bn8c1q3n7Um+A6Zl1vahaeXSnpuQer4U+QsBlEnPWUMSwaPk5mXViHS68eorDZyYX4KNgtPwQpojRCpIWoeuxOaeaWTtmwO8R/4Pkqtvxjq03RKRuduU3RCBdqDnQ/BKkghe3QXOCw03/2SNLniSP12LOXo3KNCtEvygc0h5miVWvolfo61jduoqIgoHIy2Hn4XknsEyC89Nf6FsqsaMouyjdwNWoJsdLiDUf87EBe1G3oqUn6gGHR2vrsT1K9IIcYDvK7q9fmvhn9zqC8hFugoI706TsSMUyEhxAC0VfB8ro0/16 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)(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:SN6PR12MB2638; BCL:0; PCL:0; RULEID:; SRVR:SN6PR12MB2638; X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2638; 4:Fcsm3e/PFOY0N6VL/It9eaFWHepgQnoHmY+P78WAkm8WvKREgHBvAIXlLLrXlckhpn9RR9c/kkaEsCHYeFrqfNHodbS7XjNIZ1DH3eanx96MGYytc2x1IsXkUiNUUpukwke6+GAF7E7zlKkhMH8zGIOJxi7TC9sG90+RyWhDNXj6b6UJ/ScocFudBig8flQi9/xwJ6VYg67I9IARisK8IXX79gXPAgy6uzMQn+XvaCuiM59r7h5mvXLFVVPm2bnudlLh+D5rwqySjblglvaAuw== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BSN6PR12MB2638=3B23=3A3YgWp1J?= =?utf-8?q?JqWqFP58ygl2dN8VuGDCQMm9I/CxCe4v4dUnGSHvJ0A7fIsXpTqpCrg+fKp/kNVzv?= =?utf-8?q?i7vy3g286HURI8KpqeiYrHlvnI0kSUbcY5/VJlyT8+2O4TsJUEY+k0XkXFGqGZaI5?= =?utf-8?q?GDA8eBysguXUdMojImjsb+A3uVE84P9mk9XbTqCVcZbfPRxTPwUmAK/dgIYj5aaKa?= =?utf-8?q?UXB/4e2Gna6oNwdXseOLHD/WHfde7pAfWwxBh51w4hd25J0lCthanxKSzz1JBKTSy?= =?utf-8?q?HoE1bHKJtqMWCZQy2lgtxkJqIRWYuYJL7ZmzhbmpS6p7hIiTSg6WWDkXXiwPoP/Nr?= =?utf-8?q?lDXyLrHSvvmB+gW8snB8CkV87L49kWskYghjqdII/ChljPbJy5Oc4dUYkgJWltf6R?= =?utf-8?q?HiWS4meusdL3P8yTZgxfdLAj6s5SgoUQEj4SIE4hCQtd0ZyJooh2KHSMMDfBf7H0I?= =?utf-8?q?+iCEMHOjDy+JUHMyTjV108URo47pl2QsGVNCFwnRHI4dWZnpoBQFIraRGFkA5uI7A?= =?utf-8?q?Upvl5MhjiY2rFqyUKBW7lYXiQ+ch6LVB/hQZHM+6C6bZZ1/1v7bSAZMMmikc62PDc?= =?utf-8?q?urV8+QCeZOh6AMgn0DMgObCXE3tdDg6R+STrMul3RvVA/QKgUAcqsHW56ElUscTvn?= =?utf-8?q?ikcsuJ9KwjGGjvEEbTJtoiBSMSwO0GnTnFg5ZaJJmb46RzjtSeA5LVEn9fKdDgfzK?= =?utf-8?q?94EuIZzLdULmNnHnCk1VMuYqEB/AOzQSvWxbGoAF27FAt8RrdORYNRsmaGYlWQW03?= =?utf-8?q?7a4d36u5nYogBwS5vhHMaMP83nATFJuhOZZSSkWYbaneb2DuXomfuSZZPg170syGi?= =?utf-8?q?ot30zVtsqp31OX5lSEgVied5yVOOpq9mIAkXK6/vXz+XW/n/SeY8IJPsZHuDqOweT?= =?utf-8?q?8u5iOCMNQzdV38dF0snXajJeIfbQtgteuPNzTCcTTXxCoykDVMRS8/gjFPNrfuNOv?= =?utf-8?q?YbPiWy+QurFoHsBjN57H7RGVv7edYqBjJaa2F+znL47LUI8GsOdTFRR9fBy71S7p9?= =?utf-8?q?KwakCJyODW6ZuEQHTOHPswuo3Vu/VYq16SJVIaffzGQmf6VRZtzbwVQ/VCeVkYVhN?= =?utf-8?q?7VtxSZL17MuPdnQMj6QzXLymtV06feP2ZGDEx+4scCRPV3nFrcBVuHaIiQeDE873G?= =?utf-8?q?+8al+QHjOGXJxC3db1Ild/lridWe8d7X7uNYK4zjdBxNC5Ak1jingVtxfhAHuU/5e?= =?utf-8?q?4MPK8o+qyUr3mPZQMvpY0Xm6/MsFUk9ksyu/nx5ZLIqAhstelO7N2eYEg8sA=3D?= =?utf-8?q?=3D?= X-Microsoft-Antispam-Message-Info: ldM393ONTrpbbVqvzrQoYguC/HfYOW4tYSGzTr6REy4c4ceeRnK3SDGO/GGcZ+rB6/M4DFaLJVt8G1HhRs30vbPs/sfgYWD3Hu4O6J278l5sbwCa/njMvZ71tyIPX1G1qmzNGgnC4NDINs/x22O+gSwkIISYx3w2NlfdcGT3x1ZXU6DIwEajzxHoULV4kpdiTEFHdx71M3wVQkft5uXOfB7mjGxZbfZgxXrjy6tcxdSCehkHRxbqdPnm7n+9a1NxfETP8vipbXq270rbRBER4MvH0BE3dtCUTLR1rDy90CQkP93uc/Wechhiv8SxONd5Fe+VuPBhAFstVK2BQ5VY11aTOdxxZVGSU/CtiEiyRbU= X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2638; 6:eZlOKO0AkNutfKBjEIOnHzay0L2nEZnQehUQDuP6Nry+aguzNaLTy/mw/e3siRmnk6R8rfn30yMEXL1DUV00gBZrZCfw4u4kcV2rAXFWsWrknmg9IsYA6FQ5MLUZ6V1N4cJ544ADo1We0CngQPNsto7AAQn8N0QyZTR4CRD96Vsa8UH1Y9XxTw7OZstr+zMuIeinXwtTG+4/TuSoSQLyxf0vw7ZM3DE9qZxBqegLwplX6rupy4ZVV9TC4C++vsC83z/Dx+witL/+UEIV6hDdGFdFJ8XeQInKvnCAqVIsxt2MjCzgpGxTAwjFTy3VTA3FRhdbBnFqwZ2hJ3JFdwy6v7RwujJuUM5kdy0aRXsefcPArEBzIkZGBkBaDwVuDNk6biaIR70sQQQ0At0rPeF9FEYUl2vsqhHOCJytR13Cl2nTebgsFvHiKPhPywcK7m+okZ4h9gpIE5oFy51oankt7A==; 5:JD4oc2UqBopo+kUY2DohMGYvCn3IW4euqJXLKnF8jPxYkEvtdfdCGp6DDSRjGatA8jxwTs6ZeZyDQfHLrQxU8D606NREtZH78KsbphmSa728R8n8GMht/umhLF3ESnu8DVxoJ1BeSbt3bAZiSD2LtyvTccoMV/2thrUYgzTd/oA=; 7:1T+5Yo5kq6oVL3IlF9Kj3xFrKFagDyXd2wrjq7G62NdMbe7HKECn4Gm53Cbon80p/5Kj3zHKo/dAprf84jbr9M35l9x/VXS4OcBIcxBH370CAbRB9IdTSiouZPmJFw4G/wpruIu5tWbxpuwwGTpFGQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2638; 20:8guKW4c9MjiXjgfu8v6BCHFfUY4IU08kVVzmVaaHmdyfphP8Om4O9KZxYDFfdLGh9whx3RuhrjTi2+1RC+nrYsqGFAdQVCA1+VJ1fJeDjzyGVnOcgfIMtqr6m/reTri8oRqC1da/WrcGrH719jiIThOdAu5d8SLoFb7jgValBfno4sQplBvjLeBdzFjkladdAbwdcLLwkGogTVmoKq8LbBvle6eUrMWCOJ+BpamuAYSfwi6JeuX37Q1jqduMfoDc X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 09:56:33.5614 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72b46b11-aafe-47f1-c42b-08d65c2a451b 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: 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: , 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); /**