From patchwork Fri Dec 7 09:55:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10717767 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 E850613BF for ; Fri, 7 Dec 2018 09:57:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4ABC2E711 for ; Fri, 7 Dec 2018 09:57:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7A622E748; Fri, 7 Dec 2018 09:57:12 +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 6F49E2E711 for ; Fri, 7 Dec 2018 09:57:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 637F96E70A; Fri, 7 Dec 2018 09:57:11 +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-eopbgr750088.outbound.protection.outlook.com [40.107.75.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id C6BC06E707; Fri, 7 Dec 2018 09:57:09 +0000 (UTC) Received: from MWHPR1201CA0009.namprd12.prod.outlook.com (2603:10b6:301:4a::19) by SN1PR12MB0845.namprd12.prod.outlook.com (2a01:111:e400:c45c::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 09:57:07 +0000 Received: from BY2NAM03FT025.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::200) by MWHPR1201CA0009.outlook.office365.com (2603:10b6:301:4a::19) 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 09:57:07 +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 BY2NAM03FT025.mail.protection.outlook.com (10.152.84.232) 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:06 +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:05 -0600 From: Chunming Zhou To: , , Subject: [PATCH 07/11] drm/syncobj: use the timeline point in drm_syncobj_find_fence v3 Date: Fri, 7 Dec 2018 17:55:57 +0800 Message-ID: <20181207095601.2058-7-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)(39860400002)(136003)(346002)(376002)(396003)(2980300002)(428003)(199004)(189003)(47776003)(5660300001)(53416004)(81166006)(104016004)(54906003)(50466002)(50226002)(53936002)(5820100001)(36756003)(81156014)(8676002)(316002)(97736004)(110136005)(2201001)(305945005)(8936002)(68736007)(2870700001)(86362001)(478600001)(26005)(77096007)(186003)(72206003)(76176011)(14444005)(23676004)(7696005)(426003)(356004)(476003)(446003)(486006)(2616005)(126002)(11346002)(336012)(1076002)(105586002)(39060400002)(106466001)(66574011)(2906002)(6666004)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0845; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT025; 1:GaovHP39ph2eXGmgEx/SeYlJMhF65feI0YfhEiP82mMSEu9qgL+G9L8QwsjrK1ALJll9vU9wHyA6TChMN1hme7QnpU3JF5ZP3rGeh/m3gGO2ugnifSbH1yqgvHyZy+MD X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ced5ae8e-ce14-4d9d-6dd4-08d65c2a58e0 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:SN1PR12MB0845; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0845; 3:exeuRJwYS0MTuy/7ryAiBzs6pFUKuUjrLo+WlCnBHojo8bCDv1uUpBV6tyuuAA+LX0cxNpSiLwxjC5eT7fRHGF08Vngapy2LOFmLzgZLhb4f1v4n4w6kv4brvdVM52IU85FkBbb4ElQ6WY1/9JNO2oTHF/CKIgFBXIpUTdD4RDebxyz6GsMYZelXesO8mVz+BHG5xVqMCzcJCkgaA8KhcnyPzV2SZePj+xbt1moFTEm93VBzPd3tWL+mzjOz/H+OhLx8qJKxnrsxnQtxF2J6nAQtQuTJiSN9VHwFvwN0EowAvhsuzyNrtEaqNCOuBgRmmEvsIXcStRZm+Onk7cupXqKni0+0MVD47Pgnw779hoo=; 25:CUvyKz8vPxO/oSE67tLWfdXCSfaHod4Ogd8N9RMjCEODUusKuU3TXO5evGSFtN1r4DPE92clMeTYP/q9nXlCQb+oH23EKWB8fX68BFm9q+/dbuAzQfhc5EqntaaFWxIdS9M7eofib9aTG/u5NIs2QTq7ZUSC6oaapwlSfdvbbSTSa4QMAG0/vEczjV+ukHiXD/mjCm3vP+bArcqAtJ9p24qtGm+NymYNzcs8JFZfTB0QuXnOCvPNLL8VQ0FOtgBetQoIm+Lc0aMGPi497+7HkdMG26At9rlY5cEr3tqesfdcgB1Jwo4S6pWHB7RU6rszskHqUOKBzpFSF03WolnVXQ== X-MS-TrafficTypeDiagnostic: SN1PR12MB0845: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0845; 31:LXSchmhsyZeKxlzy+oE3IvdlCcZOEc37DaoRPx78bojcl2D+IxluRIwog2UTk2zl8ehg9O4rP40v7ToEDjlGTAIo6fNsaM3xbcvbmwOzhtxjOyM4Vnin/Jhqxf5D3uYZcN60eJaM+a+KRG6U19tLHxwY9GbDabtZYqQ2GtP0NjWyJf39Ku2zsfw5Je6g/Hd2VpZbP/WjOWjshDGIZa/FKTx+DBStJhoo4EvT69eTw5o=; 20:+nPPXJDKn6W9Fo0tPMz2MqA8ELCXRj5H03v0eNAULYn26sPORl3gINkA3/NWCPmmM8nr0zmM/W0fn48fYwlxZ0vwKCvJcYTW9w+IpJOUq8AJcvgK3er1gKkBBLBiIBb+Do8Knty5poHCbokQsbppIYoW1sSfBVxETu3remgfkVUo6yxJ+0MncCBUkBSFL+kSJWNikU8Dgy4IY8Z3xa5mLyWs80ruGIBwWDIo6/+9m06B0NuKOmHMa4s3GfNuKwJ9AXOj00vcZkQjm0ADyWSKwyjCsNXBmwxkMT0RpLiquM5fKM2l9MldvswUJVjWTr03GkFE/mIjHZEmPqpASpLMUYsqCOM/PNxF4PsfZQD77xziv8oQqKTg2kRI7MnryjlmpHNa4d3Af9WwHMAZO31uZ1W8zl81+AbEukvBUqr5TmWuwLcF6qxFTzrkunIG2uvtTopUbusH4oNGa6QJ2/ElVUEiNKOdCDuBEEKipXbH3yWX6iJ1iciIpzfARqKPfg/U 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:SN1PR12MB0845; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0845; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0845; 4:L3PdxSh1RYXaiudLzO2MRYNifHQgEbWi4afQPqEiVRmTS5GPTa1Z4okRacTXnSRd3/ASzc0U1ffl2JXsePXxZcLT99mBPOZS2YhhbwyR4+tFw5HLj883WNh3c59lp9eooXU3qMrijdx9g/XvQDz3XZ09/ZlEQhc/VJPwb1por1vkRSjlNCe7Lp4zNVIbtxHYkpqJNY7KXXH0G0TS5zWUvTw+h6x0CLv21GhkG+3U5wHloixI/OGrWfCaRZ9cdKDJGfLXCHku4Tzn0HwjprWRAw== X-Forefront-PRVS: 0879599414 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BSN1PR12MB0845=3B23=3AvTJV/jX?= =?utf-8?q?qE6nIeCHz6ZZ9z2hk8U9CQXo9PtRiRZ0vxSiUVxLnc90VZ/+DGmAYT9MV8QKntA76?= =?utf-8?q?3cIX6dicGQms4WOYJ/UHr5E1e9gGHswuh+107vigSTXKA8tBBs7a5Lqny/HvtWqXM?= =?utf-8?q?bYbUBhynEhPDEzu3Fp/qVB2UkW/mwIoEHGFhE6RuSxr5KsD/uQj9DIzvWfZLXGqwL?= =?utf-8?q?kWgwQ2qZQyjJRMBwcPR3wHw9saLrDDfxNRLYb5pZMQaOZOqikTlRoUNFmZ0Uq2p+y?= =?utf-8?q?DGi0/+9o8UDZtfBfrz4o7jxnoFFk/I4jv7Hpqkj/Xl3PIIyPaEUcyp2b3Z8JhOx9r?= =?utf-8?q?o2IYaiCYmuMY60cYqzfuRCvsEB4R5W3m04z6LNdIV/ngfpX1aTenz+jONnhx1edK+?= =?utf-8?q?NW1Ze+qjFzo5lygfZ3FLNdE1o5Oj7Z0sZxCqLrAVIf2vTA5s0KDwHGWE843+aS+mN?= =?utf-8?q?W+ZAZr+DtZJ/u1JH6aPpQ6gytdXQvRTE6dXwBUtDt7VncIFlJH8RqO+wif8eY90TK?= =?utf-8?q?9rZVY/6czmp3jMNgNcL9z6sGfMzgvbAeDbdlIfZBWfy3mkieqmp3Cgz1n84W4XarC?= =?utf-8?q?g3ro9xMUvGuX00l8qqx2tosKNOe5d9ilTdKJys6Bss5gdBWQcD15rTgp8nFPR71bZ?= =?utf-8?q?mA1mCg/EKTTzwuQUH1yiAB041L4DB0Ice22XiS4hBYDWvywL/R80/PcOON1OQP7GA?= =?utf-8?q?W1aEjDQwW4wAPFA3kIR8Jl0oS2mmGtK3dgkGODpcXU85gUMG0ZXblMS/CA4xAlHit?= =?utf-8?q?wbZbsl8poFlewFfFyEjSzOt8t0Udr1XSQdjJeL2xkdUMEU4Gbf4aGn5hLvxWKkrac?= =?utf-8?q?tW8NiPZ77wbmwC4M21O0ZwZ7nPFue32XuM4DhbacC0R4/7VOlIasMACUTQbaCsBrG?= =?utf-8?q?Z2kfMPUkmElurL2udM/iJNmpVq30ZQSxAPhzOMaigaCeEqiH5TDNJtopOeHpWqKg/?= =?utf-8?q?1KL6Za647VxFiZM16lbmke+59BXuqtfm2GJOzA2xTQprd2KwAoZhnOsroz11eGMda?= =?utf-8?q?B7PKSwuWGlhCBiX6OvynTbUXBc4ElKZiEbk3bE+NqPjtkuA/ptSeP3zVXLho36Vn2?= =?utf-8?q?6a5UrnSpbQ9aPBJFv+AyWef99aeNOW0m/CjEDv5mwb9NP+gXLRAere2KsU0YVvIjD?= =?utf-8?q?cTUxFJVcHaeLaxbjKR4ARWQrBp9l9qHERSoqxV1E4QdqdcVzcv5uSXdBogJDIjkM2?= =?utf-8?q?XvwHWV/v3fkH84ydyde32h4365/97uhZNNv814?= X-Microsoft-Antispam-Message-Info: vIstVvtTzS8+XcM76uTOLpQUy3lFQXPSsLyb38paQWJfb93mx7qNhNRvbwiL4ywq3wFYvDf7LgdE8HKo5UNP0Ps8EKrwKswmdVr0wxeXFtKuUQXfyaYmCQPSD92oj5CIk3GAy5BKOl7wdKKTSz1N7u+ibN50m6/YZlHE4TFijanD+x0NTFMneB83fXgGwVhFHFHuDg1xCXYNrvqzXzNXm0bxvplfCS55TDwCIV3mqwbx/KmPkRj0tXu4blgdGwEg37f60rigKlMVKUZaTdBqe4ImkQyH2x3CJtxwjG5x5TTC5prvGCWQfZTITRg+v5bCO74VeycDHRBI04n25B4A35dHFrAK0kV7+29ZXxy44d4= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0845; 6:TfPxo5+7PRwm+qaLAWcmCn55O9WqIXBZr4zc4kPFx8GFJaaNb9ZST4pTXNqx3C++rIH3hkhEyy5aMC8clmpXSCb/JPUs7dSTjl5HK+8DtahvEqhuhFtywabJdqFXvUIBaGbFXf2VlVT+8xYmvsUFf8L28lx0UAencXFMdaGT/DCwcjS0DwTwxBsfd5nGVt/6gmJBQpAcwjfatrAm/ZO7Qs1F57TTE4ImLUJAXi3dKgh82XyulWHzJXaQxpNgHYsOkYJoIoiLMsoy7of5eL+lhYst0G7uSVMJVj5Efb2rMIcvDvLqBD3g+wCy0ZyHC3rhGoIL70WFrNJeyYcg0oU5lxYfJxLGE9CXrGI0xmBRoVzHw7+ArCpNFRNcqLstnroN2XyVHEFqf1ryNycBqcmkWi7TxjBry0iCqJ3DWAjC0jAYG0kqaspn8jl7jOF/XDq53pNTZ5e3O/1XQqpYThjpfw==; 5:jIyP5BvWYUJ4EmxJsQ7XPCYRugnDRJud/8JiRCGNx6odnF66ev1laSSL/eWdMzQL0eIyD1drVchdRct9ncIBPzmn76fBLexeDmbojO+q3bxXscVRBMcPBTguHxTGWbTpbywiHvcDy06X2DL1T9LVHaLnqzMTSKgj4AKB0oKE5wo=; 7:Os7gUnU05WC+lEhAQAPbhHH8n3d0Y7mg0sQPoSMHdcT/rxwAiuWawHF9Sf7XzmMLjEu0EMApgZu8N48So20hQhLVxCNeX4A9MNx4D5GY5wmhiKDhJ29HiFQoY0mh8Llj5RH7Z5Zw7BojvWaVJGUZmA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0845; 20:/PAN65bh2J9DjhxpkPFGS6ARD/IcVpPaSe6UDPuvvU7jO8AKmvuihIGN4r0Brp3wbKrVrptdozYCYGSRl4nzW37z8GENkk4PuaO8ZN/aOxZOTm/cnk1Zt45Z67EapHEBZ/5ZPGVGNNxIyir3QFy0VPC9R5s5T9RhcSbxSQW584MoO6RUI68BE41RQVuOt7Hdh7gzNp9i8ScZVQI/zhfWrMajgpRDFPzpmMafcGTwkf53PIuLWhSSsVXa+31ac7bi X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2018 09:57:06.7270 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ced5ae8e-ce14-4d9d-6dd4-08d65c2a58e0 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: SN1PR12MB0845 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);