From patchwork Wed Nov 28 14:50:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 10702815 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 1AA7413BB for ; Wed, 28 Nov 2018 14:50:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C2E92B45E for ; Wed, 28 Nov 2018 14:50:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09B1C2D5B1; Wed, 28 Nov 2018 14:50:45 +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,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,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 954032D5AA for ; Wed, 28 Nov 2018 14:50:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D5C66E36C; Wed, 28 Nov 2018 14:50:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 568EE6E363; Wed, 28 Nov 2018 14:50:35 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id x10so26587554wrs.8; Wed, 28 Nov 2018 06:50:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i6roHnEYUNBE7hbCqS3y6DkvstypCREUW4DZTKZ03RA=; b=BqHXoVYzE9T1kTe9OsZvFixAbr4fAXLO4dJdT3KeHX+lYFEQiXJ6Wehdy0QCK+bO4I rsGNp9ZVlahweBToJB/AB72aK7WAEc9pHZdUZiWnl8ZgXambSQ+dHDpgmG8QDhyXXnDf wN+9R5Sbeb6WAh6/rGizRBaXEULVKsMVCrw9aGTE0W+BPh0LPZ4VvVy3UF+1iFX7fVkk cwsNIHlXYWM3jLZmGuWkGhajljRJCwlztpulhr7Gi/4wGgqHN/mMD/Z/d07JwOPKXtpu J13lRdmBYa6sgyZEyqoWSVHKAptsWK/mXIKU0ZYQxQ05EFGeFAa7ckXPqGp9JOKdcQsC OTpA== X-Gm-Message-State: AA+aEWa/lwEf9c9S9pr/wcZ9se1DQPinavO2BFUBXhCfza5seU3pPFRf 4gjXuBO0itT83rY5Imkq36AC6bWF X-Google-Smtp-Source: AFSGD/Wb3JOyq3rlNTrdpBMplgrj4ckVzeYepgJi+xvg2K1mmVqb1CaQQ/WCi/yksjTMJZcLV7cOvA== X-Received: by 2002:adf:c846:: with SMTP id e6mr12232245wrh.243.1543416633695; Wed, 28 Nov 2018 06:50:33 -0800 (PST) Received: from baker.fritz.box ([2a02:908:125b:9a00:d565:1a37:fff0:7800]) by smtp.gmail.com with ESMTPSA id c12sm5235746wrs.82.2018.11.28.06.50.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 06:50:33 -0800 (PST) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH 09/11] drm/syncobj: use the timeline point in drm_syncobj_find_fence v3 Date: Wed, 28 Nov 2018 15:50:19 +0100 Message-Id: <20181128145021.4105-10-christian.koenig@amd.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20181128145021.4105-1-christian.koenig@amd.com> References: <20181128145021.4105-1-christian.koenig@amd.com> MIME-Version: 1.0 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 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 a4964f0ad01d..9a4b8f221dac 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -264,16 +264,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);