From nobody Thu Dec 18 22:54:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38A17C7EE2C for ; Wed, 23 Aug 2023 21:57:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238495AbjHWV4h (ORCPT ); Wed, 23 Aug 2023 17:56:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237747AbjHWV4M (ORCPT ); Wed, 23 Aug 2023 17:56:12 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9C3AE52 for ; Wed, 23 Aug 2023 14:56:10 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1bf0b24d925so40749695ad.3 for ; Wed, 23 Aug 2023 14:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692827770; x=1693432570; 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=8lb3DqedP/heXGkJMjC5d1tyNkFxP5nN8+vbzXMTNiA=; b=C+Cr499yqPgfQyY3nPxPCEq6UX1AKU8pgK2MvlGc4CYJO4tWHXw6War4eDSIEKN99K wBgfYDRDlRcntHc6DUFdsPyyQIHshfWKO7LYQUbvEcQj5gYYS5hXNcHWI1c+zN7r4kww HSPOkHbcy4wmwJmDNBG/xYPe81Yk761J08dd+Erer3RXrrOFpvqJEV4Ew+Xio7xt+8CT frlHmjma/h8lDl/xwKeKgRaMfG1EJ7n1H7S9UX627aePImgcxYgq/ZloVob1K+vjiK23 Fb+3OaheFPmE9HPdnUHdAPdQXs1v2mzaWYJ2HL+o+t/mTW9CSxbS4YPsTNW5awuHCir0 FTTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692827770; x=1693432570; 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=8lb3DqedP/heXGkJMjC5d1tyNkFxP5nN8+vbzXMTNiA=; b=co3rqdYt+g3U99se51UhgeutOUQRqcW2PkfEnPQ5lojEkmEZEPbBFL+elihjsHezAg 0wLiN0FlT4lhPddU5cmQJxiMlxHSANmRmaUQ4sFadfazRTdKgcvVN8pQFrVa3EJLPVQc QB7cI7bp7xW+nUmGUC7WqwHTP0i37Ob4wZu/V3woG0onqvJTIQ9FFsq7jIdKQbowI3gl axXV/H374hR/gSKCkHUMo/t39NP9UgGm0enasBXKxUvOIZs6k178qbD1PTeLWRo4u/0I gh0rPxK8qeD1mGwUMKSweDKSCTtmfUWzl2Pd+hCtiMkuH88wzSctEoTK03KnmT0Bzre5 JmtQ== X-Gm-Message-State: AOJu0Yz9ELj1CqILGcmpuSLn/gtG6aedheBWwTG/YTzUwl1CAmmwryUw HHIOCiIIDCD957c5OVs6K1DwLq+PWOU= X-Google-Smtp-Source: AGHT+IE/KDhXFCZw/E7vfnJHa+qit4DLcQcu3+4wzhG77IpXDS7Q89lmEvYo12tVk2Ff/E/axktYjA== X-Received: by 2002:a17:902:d705:b0:1bb:1523:b311 with SMTP id w5-20020a170902d70500b001bb1523b311mr9756448ply.41.1692827770102; Wed, 23 Aug 2023 14:56:10 -0700 (PDT) Received: from localhost ([2a00:79e1:abd:4a00:6c80:7c10:75a0:44f4]) by smtp.gmail.com with ESMTPSA id 19-20020a170902c15300b001b9d95945afsm4324105plj.155.2023.08.23.14.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 14:56:09 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, Xaver Hugl , Rob Clark , Tvrtko Ursulin , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 1/3] drm/syncobj: Add deadline support for syncobj waits Date: Wed, 23 Aug 2023 14:54:54 -0700 Message-ID: <20230823215458.203366-2-robdclark@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230823215458.203366-1-robdclark@gmail.com> References: <20230823215458.203366-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Rob Clark Add a new flag to let userspace provide a deadline as a hint for syncobj and timeline waits. This gives a hint to the driver signaling the backing fences about how soon userspace needs it to compete work, so it can adjust GPU frequency accordingly. An immediate deadline can be given to provide something equivalent to i915 "wait boost". v2: Use absolute u64 ns value for deadline hint, drop cap and driver feature flag in favor of allowing count_handles=3D=3D0 as a way for userspace to probe kernel for support of new flag v3: More verbose comments about UAPI v4: Fix negative zero, s/deadline_ns/deadline_nsec/ for consistency with existing ioctl struct fields v5: Comment/description typo fixes Signed-off-by: Rob Clark Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/drm_syncobj.c | 64 ++++++++++++++++++++++++++++------- include/uapi/drm/drm.h | 17 ++++++++++ 2 files changed, 68 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 0c2be8360525..3f86e2b84200 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -126,6 +126,11 @@ * synchronize between the two. * This requirement is inherited from the Vulkan fence API. * + * If &DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE is set, the ioctl will also set + * a fence deadline hint on the backing fences before waiting, to provide = the + * fence signaler with an appropriate sense of urgency. The deadline is + * specified as an absolute &CLOCK_MONOTONIC value in units of ns. + * * Similarly, &DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT takes an array of syncobj * handles as well as an array of u64 points and does a host-side wait on = all * of syncobj fences at the given points simultaneously. @@ -973,7 +978,8 @@ static signed long drm_syncobj_array_wait_timeout(struc= t drm_syncobj **syncobjs, uint32_t count, uint32_t flags, signed long timeout, - uint32_t *idx) + uint32_t *idx, + ktime_t *deadline) { struct syncobj_wait_entry *entries; struct dma_fence *fence; @@ -1053,6 +1059,15 @@ static signed long drm_syncobj_array_wait_timeout(st= ruct drm_syncobj **syncobjs, drm_syncobj_fence_add_wait(syncobjs[i], &entries[i]); } =20 + if (deadline) { + for (i =3D 0; i < count; ++i) { + fence =3D entries[i].fence; + if (!fence) + continue; + dma_fence_set_deadline(fence, *deadline); + } + } + do { set_current_state(TASK_INTERRUPTIBLE); =20 @@ -1151,7 +1166,8 @@ static int drm_syncobj_array_wait(struct drm_device *= dev, struct drm_file *file_private, struct drm_syncobj_wait *wait, struct drm_syncobj_timeline_wait *timeline_wait, - struct drm_syncobj **syncobjs, bool timeline) + struct drm_syncobj **syncobjs, bool timeline, + ktime_t *deadline) { signed long timeout =3D 0; uint32_t first =3D ~0; @@ -1162,7 +1178,8 @@ static int drm_syncobj_array_wait(struct drm_device *= dev, NULL, wait->count_handles, wait->flags, - timeout, &first); + timeout, &first, + deadline); if (timeout < 0) return timeout; wait->first_signaled =3D first; @@ -1172,7 +1189,8 @@ static int drm_syncobj_array_wait(struct drm_device *= dev, u64_to_user_ptr(timeline_wait->points), timeline_wait->count_handles, timeline_wait->flags, - timeout, &first); + timeout, &first, + deadline); if (timeout < 0) return timeout; timeline_wait->first_signaled =3D first; @@ -1243,17 +1261,22 @@ drm_syncobj_wait_ioctl(struct drm_device *dev, void= *data, { struct drm_syncobj_wait *args =3D data; struct drm_syncobj **syncobjs; + unsigned possible_flags; + ktime_t t, *tp =3D NULL; int ret =3D 0; =20 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) return -EOPNOTSUPP; =20 - if (args->flags & ~(DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT)) + possible_flags =3D DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT | + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE; + + if (args->flags & ~possible_flags) return -EINVAL; =20 if (args->count_handles =3D=3D 0) - return -EINVAL; + return 0; =20 ret =3D drm_syncobj_array_find(file_private, u64_to_user_ptr(args->handles), @@ -1262,8 +1285,13 @@ drm_syncobj_wait_ioctl(struct drm_device *dev, void = *data, if (ret < 0) return ret; =20 + if (args->flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE) { + t =3D ns_to_ktime(args->deadline_nsec); + tp =3D &t; + } + ret =3D drm_syncobj_array_wait(dev, file_private, - args, NULL, syncobjs, false); + args, NULL, syncobjs, false, tp); =20 drm_syncobj_array_free(syncobjs, args->count_handles); =20 @@ -1276,18 +1304,23 @@ drm_syncobj_timeline_wait_ioctl(struct drm_device *= dev, void *data, { struct drm_syncobj_timeline_wait *args =3D data; struct drm_syncobj **syncobjs; + unsigned possible_flags; + ktime_t t, *tp =3D NULL; int ret =3D 0; =20 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ_TIMELINE)) return -EOPNOTSUPP; =20 - if (args->flags & ~(DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT | - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE)) + possible_flags =3D DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT | + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE | + DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE; + + if (args->flags & ~possible_flags) return -EINVAL; =20 if (args->count_handles =3D=3D 0) - return -EINVAL; + return 0; =20 ret =3D drm_syncobj_array_find(file_private, u64_to_user_ptr(args->handles), @@ -1296,8 +1329,13 @@ drm_syncobj_timeline_wait_ioctl(struct drm_device *d= ev, void *data, if (ret < 0) return ret; =20 + if (args->flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE) { + t =3D ns_to_ktime(args->deadline_nsec); + tp =3D &t; + } + ret =3D drm_syncobj_array_wait(dev, file_private, - NULL, args, syncobjs, true); + NULL, args, syncobjs, true, tp); =20 drm_syncobj_array_free(syncobjs, args->count_handles); =20 diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index a87bbbbca2d4..503ce4008693 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -887,6 +887,7 @@ struct drm_syncobj_transfer { #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0) #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1) #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 2) /* wait for time po= int to become available */ +#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE (1 << 3) /* set fence deadlin= e to deadline_nsec */ struct drm_syncobj_wait { __u64 handles; /* absolute timeout */ @@ -895,6 +896,14 @@ struct drm_syncobj_wait { __u32 flags; __u32 first_signaled; /* only valid when not waiting all */ __u32 pad; + /** + * @deadline_nsec - fence deadline hint + * + * Deadline hint, in absolute CLOCK_MONOTONIC, to set on backing + * fence(s) if the DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE flag is + * set. + */ + __u64 deadline_nsec; }; =20 struct drm_syncobj_timeline_wait { @@ -907,6 +916,14 @@ struct drm_syncobj_timeline_wait { __u32 flags; __u32 first_signaled; /* only valid when not waiting all */ __u32 pad; + /** + * @deadline_nsec - fence deadline hint + * + * Deadline hint, in absolute CLOCK_MONOTONIC, to set on backing + * fence(s) if the DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE flag is + * set. + */ + __u64 deadline_nsec; }; =20 =20 --=20 2.41.0