From patchwork Thu Aug 23 08:25:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunming Zhou X-Patchwork-Id: 10573545 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 4CC9913B8 for ; Thu, 23 Aug 2018 08:27:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A1CC2BA16 for ; Thu, 23 Aug 2018 08:27:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EC3A2BA25; Thu, 23 Aug 2018 08:27:15 +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 56B732BA16 for ; Thu, 23 Aug 2018 08:27:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 58CFE6E4F0; Thu, 23 Aug 2018 08:27:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680081.outbound.protection.outlook.com [40.107.68.81]) by gabe.freedesktop.org (Postfix) with ESMTPS id 86B746E4E8; Thu, 23 Aug 2018 08:27:10 +0000 (UTC) Received: from CY4PR1201CA0015.namprd12.prod.outlook.com (2603:10b6:910:16::25) by BN6PR1201MB2496.namprd12.prod.outlook.com (2603:10b6:404:a7::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Thu, 23 Aug 2018 08:27:08 +0000 Received: from BY2NAM03FT036.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::200) by CY4PR1201CA0015.outlook.office365.com (2603:10b6:910:16::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1080.13 via Frontend Transport; Thu, 23 Aug 2018 08:27:08 +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 BY2NAM03FT036.mail.protection.outlook.com (10.152.85.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.1080.9 via Frontend Transport; Thu, 23 Aug 2018 08:27:07 +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; Thu, 23 Aug 2018 03:27:06 -0500 From: Chunming Zhou To: Subject: [PATCH 4/5] drm: expand replace_fence to support timeline point Date: Thu, 23 Aug 2018 16:25:41 +0800 Message-ID: <20180823082542.2998-4-david1.zhou@amd.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180823082542.2998-1-david1.zhou@amd.com> References: <20180823082542.2998-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)(376002)(346002)(396003)(2980300002)(428003)(189003)(199004)(50226002)(53936002)(478600001)(50466002)(8936002)(14444005)(105586002)(53416004)(2616005)(4326008)(450100002)(186003)(48376002)(8676002)(51416003)(7696005)(2906002)(76176011)(72206003)(26005)(81166006)(106466001)(81156014)(68736007)(77096007)(2351001)(36756003)(16586007)(54906003)(356003)(1076002)(6666003)(316002)(97736004)(47776003)(5660300001)(336012)(104016004)(305945005)(446003)(426003)(126002)(476003)(86362001)(575784001)(11346002)(6916009)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR1201MB2496; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT036; 1:jhKZYGR8ljktQecUCW729V+aQpmiajUoLM+XgMc3dfZ/k8CSuEPFRZZYKwiNEl6CcmlT55KmROOT38zLOg6+A68E/eZmmNHkK9rdPuKYByozVVK0RTIOOskjdgLi6wLu X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4fb74878-5d81-42c6-accf-08d608d2372e X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060); SRVR:BN6PR1201MB2496; X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB2496; 3:0sT5r1cdN9G9PK4nZjH+O55BeVZQGkU3+OEY5I7xR8Xfzzo1inxZTPzJHbIjWbTZCTanaFeSBo9QvSqkhN+ByjLpgvuqzq0OfgDH3AXCuWLXgY5+Nk8cSMolVAsi2WGmOzoF8aKmlJ02NOin9JxJIjKc5FXMbVZ32Fo+GLp05BnCHyP4Y5q+y2hZbJuohzZO5AblwQ8ZuklemLJlMHPS0Z9XP1so5swfrCEpFEQt0K+l7Ye4a1eXmFM5RyknZjPITcvclHmoMwqR/OY5Ku4TkpjKuu0t875GWr2hOkQq55CWR4urKLNJAStdp7CmPUoXWYis6NV9YQfa/4QoEU41ZINlltjIvmnmfK3RLkKNguU=; 25:YENm1cYqvbv/RdFQN9/4HsBawIl80CjL8LkpiER55FjgZSh6Kjkgqxqahake/nAHzbA76nrXd+/HcbuNdyDFW5VoP9pL4+Tz0ofZLarjfJZ1UNKFNxI5mMifq5cQTVOlntQRaR9M4KtsrFpzJQZQqtzAQ2xqo0uiOaTVmL/iYmCT0eMJxJfVX5PHZUUwJ6mB7ClCWHgFIsLXS9W2XvHJTAdFDfMCKrMDbsCxFARGtufi3sxiEuEp+53w6WiyP2a4hyA621Shto1I+IVHH/WNxYbje50cOB1VQAkHurZxxgt55Y/ZG/jdwEGnIoMgSANxdX2xdy4PEEJdLi9Hvqu5yA== X-MS-TrafficTypeDiagnostic: BN6PR1201MB2496: X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB2496; 31:QxNZgLyEWac5wDiVkKEKZ39AflWbnetKI/gdbn4OS92B80Kgo/7FEWr1LSGzXPYaSn6HhgHnOACdVvtJGm9YZ88Y53gQKQ0/5kiEp5exuNafvv5c7ZN8kNwiZBqlfg8GsGp1AEG4/t+JANYNskLAKwwn4IZytJAB+0cNandmrlEQx4aMhQMWtDHVmIFn7lv9hlRjhcs7L0n6TeikwQeD+Ee0Kz1qYOcbrOQsku7gN8w=; 20:IDWuuA/tK50Zgd+HIqZF4BKd/kQkdNMzDoJebqu0YqII6u3Rb5esk0t+hjpORal3dl/E80y1Ig/G+hAGqR+8cgpgtbBrbPXlyh/7T8bFRDrGAOL8R3McvwO0/gbkCdST7Lj8AzOkgSHoye5hjC5uSQP8cCmdaayp40J9mjqQk9wMYFalvmugLxLyjUFq8oY8uQaYPdy73wmZACbj6A9xzaDvWA7Ei8VqDdp8qyfRtzjZCaGZDgFLJ5U8+uL0cQRTaJ++0oQODHFOnFIBXWnkCeAiBqiw/DEP6dCXeAirsFZy4P8L/hFGGEMTfnjxPwHeISqe5O66Xjs46f9qKZevYgHvwaH6YoDjJ2rCdQ/ewMTsAGyXJ7AohPgzdBbPEVnxtDELmBHawiikSV6gJhxzniS9rmtbOWrg/dXHl5ZOK53l0kf0ffnWDGlJM7zmq9RYEpAtBWNd52LsLc59hqOq9tAiGguDeQQ9pHjz+ylRXysmvRnL+gXtgHXOI21F9vb8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(788757137089); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93003095)(10201501046)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699016); SRVR:BN6PR1201MB2496; BCL:0; PCL:0; RULEID:; SRVR:BN6PR1201MB2496; X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB2496; 4:0893yCiFnBriYmKA5nASXQjFOzblFuX0kq5xjvVaIAfdKz3+LwlyorrH1JJ3oAZrCy+NXUl9fByGH2l+1hUxoQH4zdt067fYme4x5o9vdZQLvoan0TIFp/2d04A8RtP3kCYbnaqByTHciNRdZiZqLGF5CTkLtrdt1pgcq0CxDQF3jtgVYCcHEMd8sGhxyEsKXJGEdGCKdj1vOVk83HwBInEmOXtY2KwUD2mke/hz4IsMrQzZu1pJzADIxZgNhLJuJQXQfXzuB3NRxXI5UEmdHh1S8oqYRmzjn8M1g7JXWQGt8x3PDfygi/00t043Z/1fiRov7EjIo8W1jILoW9Di8Q== X-Forefront-PRVS: 0773BB46AC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR1201MB2496; 23:2vyDb33pdXyh4FFx48i1py1w1xsWKBV6wd296fx?= Trss4HnI+ah6t9Zvdq+DGINKWfgMB2t4SzMCZbZ2XyIm29tU7I53r5qrFyR9u8S+IfArXcMU1VAhwtzMhBfqkUsk1TlYH0mNwT2DVw3B61aPHp4ctGWg3ZFjb0DEMkKnbgA2CB214o4EruMEKGCIBwPnphFfQu+u+s4XHIwu0PSq4HkehWvc8rh2Is7+D8q9kZKWNCyl+JLToC8GnBNDlAMJiZ6BOQruZJyolhftmsI7maly3rXrFeOuFYABm37N0y4UBLU/LhVWlX4ySMhRM8h8P4jWrASpRe/S1TgMZY07k16Dsq5O4WdiUuT9/YPUJ+UGUf+j1qhTIJTpuaoLRrfr60zf5vUJzdBHTKQ2uCuFfAe5XYYeOKk2PV6ygWrzv5990mL9WwXd6U0ocUlMbGuJii0szL7bksPCkqGwZwqJ44BA2UQGbC8EleXyS20VMmvgl92TnEheJIz0p/qFwQWmvFlAvEuAm9jpUbOsMEWDAo/xDfIPlYL4Ipn0yHIFoUHTFL78mdco3VmyvZmUj1yChlZ1hcZD6KXPkbM4SJnKkkfr6k7kA/wJaDahm/t0ilIPxofPiyAILqA+YHvEu2fByM6X8qlYpgc4hMzYjyCZrygR0cAuXmWKi5gXw39lp2t06VPVrVufftVt+2boqpxSdmBgtOYWIDvkXEDGRwGCA0tKkkKZ8H6SvE4Aw3vzqP0HvTrYXn4hfUx2IQnculELhSNxaDfA/e0FTs5jCAiAH8EOLj9DEFI6rk7/W0KDymQGILwjmvQhsd2ONHXHfNsKX0bL01fG4B5vWaHG5+DJ9Cu/eXUGp60AXtxYiNMjUYKiMFLufHJqH64HvQPN1n1Z8wiu/0RwtgGAcLhPd65bmoaQPXT6UroOWrFFQFG2F7pZm7C0UHH6fP7lYOOuby1NY+hj/uxW693svsDQVZfesAsWujy/4xa1fZ1u+1LJIzwVlp/1NHNPJor/2Tu0CgRHihSDikyh2i4y6xVuq+mr7H8hNj5DlskKHevXn+NmK/xs+qQK6okLa7/LDUB6loOreJMmIoBJgdfjYzWehARx/2LgXG685eF9RgeK/+f0mTsRPqblR73b7WGcM2I/zjVZvXErJxKq+dJ8yuj75YaNcF+lMcdQRKyVtj/90wBLn5+6iFyXtwOZL/hfhzNNhKldRYQ+htrsje/TeZ7JKsfntief0slR2jzqQQE4XILs2WgI= X-Microsoft-Antispam-Message-Info: kTwzqHPrBOjchLbpAcTgQj9WuCyYX4AFw1XJCTAbre1j84KZQ8NoFJiBpfzV8oeCpbDrobdbaZjtP9qYRQEoBJHiwbWgZXuVw1jKV/3yaYPfB9vlmHViNQwNXF60dp7d2nsFtktxlhTWqwwCRJDPD8tWR/HzTw2CmwZJI12DoUNyoiFMbOWjIjFf39jCVp4FkAGBauzkjY/Tge7iYlUYYv5vvl4XmwRvnd17OKrlTE9ocjbtNwhkMIbmprFXPx7f0FzCFc/59jwfE9fL6ApSxZztP8MExMgcu1c2I1xN8fJOr9GDN0hHOOWjlyXcN0JReKDhTjswGGOHQgMmCvORzlQxSVyv8FGROj5L9/+0B5Q= X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB2496; 6:IVYU5sxIswW1MGX76cN/z1gq7zs0fN5fGbWx8wnm2Jg09rE9jNbUjEMM4VAcnDuEZ+nRidc6zcpCF3shZp4stFsj4boGGuqZVNmo7LctvC2M1oW4OAR7By4awfjlt96ihXpmVrxtiNqv3ez07Q1q78L1jmVTISZ2MwjrMEj1CpfHTTXh/Df8bPhHQ/gN3h0HCVrxvBTiORePk3OM2uKhYSoD3usMwEYC39WoOVXPTS/tqRVejscfQM1Hg8aGlUhEiog7P48bbljVQkeYKtZ53lSDHanaRxb0qmeu1L99bF5TI5RvsP/mIun+OH0UZECtCkFZc1n5Ni0SsOBY4Xu4cEAPAGOvxvyRyC/lxUX1O/Z8UQHtG8P6lW18d2vNTSbyJt5YQ1cK2FEBufZBkOwW0OzfLD825mg5qoy1P6rrtSp0e9xVEfN0CChR+U2s7PzAVfnBXd/TkE2JgOpHZizdrQ==; 5:VZLjiB1PagotNYU6A8q3c3kG5HsbFYnYMbZuKFbp0DPzPKEs4XuFqGczAShFkJ+DzzqGFaB6mKxpbNC1hMdfIsBqDP9OChwvkqsPsZs42S2ULb+wTV/+mJx74/U3tUCjsTsw3toXwgGPyC6GUI1NwxsLfAEgrZtJ0m5tkaBgK4Q=; 7:BpEL0IhATIDZ9OmvSnOphN12XiQHM1iOsMDogekREdpk/o/z4mrzm8PFZreAEeJWQjfCE+zihBN2jz86LbDMPZnVuEnUYcfc2wrU/cCOFKe8WhouCwcloyl4MN5rQ2jgm/jiki6WJIHJdZyqnNGicv9mrVvHVVFH1uZKASh7u3fL4m8vx9SRQNH3G9nV14pdRIhzfIHRTyqsj9bMGDU8lqwHWWtmjyiXuVDpmkfCYNuPUbRhfa8CIS3wLAKEVw3+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR1201MB2496; 20:lc0WYCaA5gFj4PZLEui4ITk6pIoF3x03C3lDMY3TI1IfGkmqlgI6mEG6OAMzr4KGVZ/ZYAX1N9DwGlc/KlA623x8zhlovA2G3DB7x2uqU3Rq8/5KbOVQLGGAKVohBjVrhKg3wBufQAe4JIQ0Q9qHiNM1G6BxBxoDIOEvKquM0kmf2XR9SDQYA4vEd3MtPX8OiqYAg45M12sjx1knNvstCMckR7WlPYJsIR1wU7Zx8jdBsjI8LyvxcAql2KCoMHrl X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2018 08:27:07.9588 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4fb74878-5d81-42c6-accf-08d608d2372e 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: BN6PR1201MB2496 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 we can place a fence to a timeline point after expanded. Signed-off-by: Chunming Zhou --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/drm_syncobj.c | 16 +++++++++------- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/v3d/v3d_gem.c | 3 ++- drivers/gpu/drm/vc4/vc4_gem.c | 2 +- include/drm/drm_syncobj.h | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 4d3f1a6ee078..ef922e34086e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -1151,7 +1151,7 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p) int i; for (i = 0; i < p->num_post_dep_syncobjs; ++i) - drm_syncobj_replace_fence(p->post_dep_syncobjs[i], p->fence); + drm_syncobj_replace_fence(p->post_dep_syncobjs[i], p->fence, 0); } static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 3aac0b50a104..6227df2cc0a4 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -141,11 +141,13 @@ void drm_syncobj_remove_callback(struct drm_syncobj *syncobj, * drm_syncobj_replace_fence - replace fence in a sync object. * @syncobj: Sync object to replace fence in * @fence: fence to install in sync file. + * @point: timeline point * - * This replaces the fence on a sync object. + * This replaces the fence on a sync object, or a timeline point fence. */ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, - struct dma_fence *fence) + struct dma_fence *fence, + u64 point) { struct dma_fence *old_fence; struct drm_syncobj_cb *cur, *tmp; @@ -206,7 +208,7 @@ static int drm_syncobj_assign_null_handle(struct drm_syncobj *syncobj) &fence->lock, 0, 0); dma_fence_signal(&fence->base); - drm_syncobj_replace_fence(syncobj, &fence->base); + drm_syncobj_replace_fence(syncobj, &fence->base, 0); dma_fence_put(&fence->base); @@ -258,7 +260,7 @@ void drm_syncobj_free(struct kref *kref) struct drm_syncobj *syncobj = container_of(kref, struct drm_syncobj, refcount); - drm_syncobj_replace_fence(syncobj, NULL); + drm_syncobj_replace_fence(syncobj, NULL, 0); kfree(syncobj); } EXPORT_SYMBOL(drm_syncobj_free); @@ -298,7 +300,7 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags, } if (fence) - drm_syncobj_replace_fence(syncobj, fence); + drm_syncobj_replace_fence(syncobj, fence, 0); *out_syncobj = syncobj; return 0; @@ -483,7 +485,7 @@ static int drm_syncobj_import_sync_file_fence(struct drm_file *file_private, return -ENOENT; } - drm_syncobj_replace_fence(syncobj, fence); + drm_syncobj_replace_fence(syncobj, fence, 0); dma_fence_put(fence); drm_syncobj_put(syncobj); return 0; @@ -965,7 +967,7 @@ drm_syncobj_reset_ioctl(struct drm_device *dev, void *data, return ret; for (i = 0; i < args->count_handles; i++) - drm_syncobj_replace_fence(syncobjs[i], NULL); + drm_syncobj_replace_fence(syncobjs[i], NULL, 0); drm_syncobj_array_free(syncobjs, args->count_handles); diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 60dc2a865f5f..fab3b8fe7a60 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -2211,7 +2211,7 @@ signal_fence_array(struct i915_execbuffer *eb, if (!(flags & I915_EXEC_FENCE_SIGNAL)) continue; - drm_syncobj_replace_fence(syncobj, fence); + drm_syncobj_replace_fence(syncobj, fence, 0); } } diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index f6dfb8140a62..f3ec1f18c04c 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -587,7 +587,8 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, sync_out = drm_syncobj_find(file_priv, args->out_sync); if (sync_out) { drm_syncobj_replace_fence(sync_out, - &exec->render.base.s_fence->finished); + &exec->render.base.s_fence->finished, + 0); drm_syncobj_put(sync_out); } diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index f7b4971342e8..68832d66d716 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -681,7 +681,7 @@ vc4_queue_submit(struct drm_device *dev, struct vc4_exec_info *exec, exec->fence = &fence->base; if (out_sync) - drm_syncobj_replace_fence(out_sync, exec->fence); + drm_syncobj_replace_fence(out_sync, exec->fence, 0); vc4_update_bo_seqnos(exec, seqno); diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h index 9962f7a1672c..335ec501001a 100644 --- a/include/drm/drm_syncobj.h +++ b/include/drm/drm_syncobj.h @@ -132,7 +132,7 @@ drm_syncobj_fence_get(struct drm_syncobj *syncobj) struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, u32 handle); void drm_syncobj_replace_fence(struct drm_syncobj *syncobj, - struct dma_fence *fence); + struct dma_fence *fence, u64 point); int drm_syncobj_find_fence(struct drm_file *file_private, u32 handle, struct dma_fence **fence, u64 point);