From patchwork Mon Feb 20 20:18:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 59649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1495835wrn; Mon, 20 Feb 2023 12:21:22 -0800 (PST) X-Google-Smtp-Source: AK7set+aTZcNRQHxg8reO7uKFMeucCc9E36I9JM5NpuIDzirRU7AIKf78A9sPr9yUr0nOlbspVK7 X-Received: by 2002:a17:903:247:b0:19a:a39b:a879 with SMTP id j7-20020a170903024700b0019aa39ba879mr4827134plh.47.1676924482284; Mon, 20 Feb 2023 12:21:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676924482; cv=none; d=google.com; s=arc-20160816; b=yg44lQtqc1eqqGVb5Wcb0vXL9dIqJdkPJQLTdo/n1A5pI+3DWjsBM4PH+pmf5wT5Sh Lb2E4nBPIK0Y+LdFdOnBoZgXBqsf9KbgQeJ/ppaWmnHCmTqHoH7EZGlyaC06B42F/G2z L1Y5JCmIICqeyoJpoD8y53sdzRKHN7urBHt8GXC9nFf3CcL13OD3vebWIzYjVrCgl6ZH cEwsKXvnJ/+T8SvkDN2bZTiQ5zs4AthiRFgRChiosBKZNWkW0KItiXWV67Hb6qY3r3wY Lpuk7KJ307lU5gC2TjLpARyJZph5yEaRk270oq+RYms0KbGF1XZsvB7CKx44I02a1bhE HKSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MUhwCn+Xf/Lh0tYXdZ7kyW7NLgJoG2FRHZEn6JIAUnU=; b=Nd0j1Oyd7PqXsHk3qGuRM/imhmEXh1b3NpHCml6tJqLkfPAIedJmt4jkODuFyOMGJM UJy2oc8FkcF3GW2Ljcf0jaM+6CV8uj7Qy74/hN7r4hyex/3IBaGB5rs4tLI6n5itm5zB qF7vjRbBNhjP1sEIANUh4tr0O16tekZY5XaEM7koY0R0JQhasItAqGxkis78D163SfKP f5Autxm6dR6Z2Bvn04gt3S0h25lgrkmD6dNQRT2vHP5HSMPEnvJ1slk+AYGFSUyOypLW TWBLQ5tEN8ePO6gEuAviMkIZUP+gVq76D/hSR+knd7UzPEBJIRlsXNIdYhOcP4wrLij2 7fsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="TLl/TPdq"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a64-20020a639043000000b004fbd4eb35d9si1576255pge.156.2023.02.20.12.21.08; Mon, 20 Feb 2023 12:21:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="TLl/TPdq"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231517AbjBTUTj (ORCPT + 99 others); Mon, 20 Feb 2023 15:19:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232613AbjBTUT1 (ORCPT ); Mon, 20 Feb 2023 15:19:27 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1EAE1A679; Mon, 20 Feb 2023 12:19:25 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id x20-20020a17090a8a9400b00233ba727724so1637091pjn.1; Mon, 20 Feb 2023 12:19:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MUhwCn+Xf/Lh0tYXdZ7kyW7NLgJoG2FRHZEn6JIAUnU=; b=TLl/TPdqwtRVyveoqEQwyAPlXFgjLvNAuBIDILQ7Oea8iShNEbj69MwDSh/ZP2fh6c TV1oOrQe0ax0dddlxozQsiJDUBwCnQRl3HXHq47Nn4DMjkNY4G2zL+SVcy36iMieZbup afcG/xfi/AK0Meeb6pxNWibWBy77ENmfnk+NDvcNXQYxyLEBF2gE5SyMvWisXrYlPfWP MTsyf12mxXXsXfO9FE5gvS40BYBJ2pdxeef8KaLJMLJgpTDxzdVKVgB6ALvJC8MEuDJ4 4oYX/Nhw3xsvftd2XfRdtU9Svkyxdl7GrHIR1Fwh1pBSL35Gzh5tgAZR9tpSjJu/Sq+p Dtbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MUhwCn+Xf/Lh0tYXdZ7kyW7NLgJoG2FRHZEn6JIAUnU=; b=KHrnKazFo8AukGGEGTI++Tzv2FzL+tlXoOtKa7bfy8887/pQ2ePUV+wYV3lzWlj72l hSP1SYYJwd8pPFL18hYZOtOU5vp99H6LaTwFk9VWd+vwYltpECNmgtSwnBW18u0iYOMy OLdeELvYONRJKLwfefugrO1GqW0CjiMjZiuReWRFKUNOLKsJM7cG9zitYnjUu77m/kT1 9G80vnP6zcV7wY6G9xQ3BOhtUj6PECQr3XgogdVzvylHWApawS/ftiOVTrreWiUp3Yig cHvNHDrngKvZvF4sV5ua8gDRXpQ40i7W61g8GkCq2QTPZz8Xs+B+FYI+kFaFcSyEDMoT +ytw== X-Gm-Message-State: AO0yUKWS/2EQRsf2qRFlGXLFG24+yi7axckyEV1ydlvK1NS26utbAtf+ F5mzCrh4uT+ueBZ/ulRZYkk= X-Received: by 2002:a17:903:1d2:b0:19a:a815:2868 with SMTP id e18-20020a17090301d200b0019aa8152868mr2217276plh.44.1676924365081; Mon, 20 Feb 2023 12:19:25 -0800 (PST) Received: from localhost (c-73-67-135-195.hsd1.or.comcast.net. [73.67.135.195]) by smtp.gmail.com with ESMTPSA id je13-20020a170903264d00b0019a74afe97dsm8306264plb.187.2023.02.20.12.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 12:19:24 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, Daniel Vetter , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Michel_D=C3=A4nzer?= , Tvrtko Ursulin , Rodrigo Vivi , Alex Deucher , Pekka Paalanen , Simon Ser , Rob Clark , =?utf-8?q?Christian_K=C3=B6nig?= , Sumit Semwal , linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 04/14] dma-buf/dma-resv: Add a way to set fence deadline Date: Mon, 20 Feb 2023 12:18:51 -0800 Message-Id: <20230220201916.1822214-5-robdclark@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230220201916.1822214-1-robdclark@gmail.com> References: <20230220201916.1822214-1-robdclark@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758382766106451049?= X-GMAIL-MSGID: =?utf-8?q?1758382766106451049?= From: Rob Clark Add a way to set a deadline on remaining resv fences according to the requested usage. Signed-off-by: Rob Clark Reviewed-by: Christian König --- drivers/dma-buf/dma-resv.c | 22 ++++++++++++++++++++++ include/linux/dma-resv.h | 2 ++ 2 files changed, 24 insertions(+) diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index 1c76aed8e262..2a594b754af1 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -684,6 +684,28 @@ long dma_resv_wait_timeout(struct dma_resv *obj, enum dma_resv_usage usage, } EXPORT_SYMBOL_GPL(dma_resv_wait_timeout); +/** + * dma_resv_set_deadline - Set a deadline on reservation's objects fences + * @obj: the reservation object + * @usage: controls which fences to include, see enum dma_resv_usage. + * @deadline: the requested deadline (MONOTONIC) + * + * May be called without holding the dma_resv lock. Sets @deadline on + * all fences filtered by @usage. + */ +void dma_resv_set_deadline(struct dma_resv *obj, enum dma_resv_usage usage, + ktime_t deadline) +{ + struct dma_resv_iter cursor; + struct dma_fence *fence; + + dma_resv_iter_begin(&cursor, obj, usage); + dma_resv_for_each_fence_unlocked(&cursor, fence) { + dma_fence_set_deadline(fence, deadline); + } + dma_resv_iter_end(&cursor); +} +EXPORT_SYMBOL_GPL(dma_resv_set_deadline); /** * dma_resv_test_signaled - Test if a reservation object's fences have been diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h index 0637659a702c..8d0e34dad446 100644 --- a/include/linux/dma-resv.h +++ b/include/linux/dma-resv.h @@ -479,6 +479,8 @@ int dma_resv_get_singleton(struct dma_resv *obj, enum dma_resv_usage usage, int dma_resv_copy_fences(struct dma_resv *dst, struct dma_resv *src); long dma_resv_wait_timeout(struct dma_resv *obj, enum dma_resv_usage usage, bool intr, unsigned long timeout); +void dma_resv_set_deadline(struct dma_resv *obj, enum dma_resv_usage usage, + ktime_t deadline); bool dma_resv_test_signaled(struct dma_resv *obj, enum dma_resv_usage usage); void dma_resv_describe(struct dma_resv *obj, struct seq_file *seq);