From patchwork Thu Dec 6 09:37:25 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: 10715505 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 0CC0A17DB for ; Thu, 6 Dec 2018 09:37:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F17C82D39C for ; Thu, 6 Dec 2018 09:37:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E64D52D5F8; Thu, 6 Dec 2018 09:37:47 +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 A8EDB2D39C for ; Thu, 6 Dec 2018 09:37:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B4DAC6E562; Thu, 6 Dec 2018 09:37:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CDE36E55D; Thu, 6 Dec 2018 09:37:36 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id a18so291680wmj.1; Thu, 06 Dec 2018 01:37:36 -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=4S/LnTpiyTHcdnt7JdEe+VvAztUpKpVVwuJd33gU0jo=; b=oCjuzm52K7/yycy5U+4rl9eSlW19GiB+d0UfUAUGCoy9kPdkBXmYoTKsYnOY3maUgy gRbxlhW8px1jG5FXdNGki/rN7yLW4P2BeHdH2D1G0vbbHuxY1vTO/0rP5NPXYq4hibxX clTVYQDRAqRacuuCTDCdGeUFcyUSs2jxWRJOeJxoQMMFF7+Jjsm42uwIluJUYxOUEd6G MzfBSFd1jM1UEIb6PZzAKjFvd+Th1nCDQhz/DSpZZYrVkIsSP90mECCavHyjRGIRTKN0 FzCz6XYM4S0EFnu8II9LaozfsJSawAhBmZkbtrGJMO/3f9GxbcZQGm95Us4vPpvs3KRH H36g== X-Gm-Message-State: AA+aEWZbA3x1FxiQJA9C95YXFpsZh07IJRX5PLgem1ql8Sq0ZjRqdqv2 gq0ancJEv59ixomnJ2JQ4BZjnxGQ X-Google-Smtp-Source: AFSGD/WtkuoVDnuGsd5PRQgF1GZCWlVMeGFEMk7mg7ndS0uVNdlNbkEq4R0WpvYWqajK9DjYbixFeQ== X-Received: by 2002:a1c:9803:: with SMTP id a3mr19554851wme.69.1544089054527; Thu, 06 Dec 2018 01:37:34 -0800 (PST) Received: from baker.fritz.box ([2a02:908:125b:9a00:b917:e857:eae7:62b0]) by smtp.gmail.com with ESMTPSA id c77sm334060wmh.12.2018.12.06.01.37.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 01:37: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 7/9] drm/syncobj: use the timeline point in drm_syncobj_find_fence v3 Date: Thu, 6 Dec 2018 10:37:25 +0100 Message-Id: <20181206093727.16792-7-christian.koenig@amd.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20181206093727.16792-1-christian.koenig@amd.com> References: <20181206093727.16792-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 1d830760992b..54fd7e34ceae 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);