From patchwork Mon Feb 20 20:18:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 59652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1496107wrn; Mon, 20 Feb 2023 12:22:01 -0800 (PST) X-Google-Smtp-Source: AK7set8ygAVP3XiG7BNj/m+oXrVVy5zWgALLnYI84UkNPVs/8zjrJy1rppArbc9Zp5HpdOkaTZhK X-Received: by 2002:a05:6a20:5492:b0:c7:6cb7:cfbf with SMTP id i18-20020a056a20549200b000c76cb7cfbfmr2686045pzk.10.1676924521129; Mon, 20 Feb 2023 12:22:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676924521; cv=none; d=google.com; s=arc-20160816; b=ZBA/hD/v18n48DZ7fT42Px+YqLfoai9BFFpprQelmTx/JWwg3vsx+vguHCQ3YjOW9V fdod4syJerg553T+ZSPuRAsR1VrgwcM0x4909FF68E2/ZJf1nrasKUtRR0ZW1rSZ12OX q7FcKhS6vfx3GGDsWsHSGMuW3ZX4tDs14xkDUCm6Wx8FXIk4qahybyQWvv98haDJH/EY F2Y2xCOreh7QCHWL64LS8Wmz+sgzIaNp2VTo3Kcay8l1Lbir6UDi3/OJjeb6vD9apzek qrl0n+FCE5heI5NofIMjLjSwSW+9dKqUfJorHbflYWvLKGMSZucfwKaolQ8x3Zo0QqnZ 9LpA== 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=GH3/jlogTfpFoXcAzPRW2jnyuGq7pnjcvoLksYjq4sE=; b=Ifz+diDO0i2naeWgZZU89zEujG/7t07a4r9QNSMzNSyN8GqG4vWiw88sRDaetdu7W2 YgMyGYnnoqLGDYrsdixHFX0s7BJUFvNbtb32uz8ClsZJEfg9d7ErHMuJaGrY/pJ2n6SI XLlXajOwlrohpNIDru6qgV/2YH1JXX8ykAa+nmpXYrbISmhkJ+SN44F/nNMgc1gFDHM0 UV4ECMDVo+2aKx6nl/yvLUE73Cex8Vpg4zDXxYPwBZKbXlQlCqemNFpzRTtKSSbz04Qu I5EcybdknPQlymRs2UR8Y+wu2Zer2BXIwYKfQSyPYIIjF8Ka6Kpfih22tx+NueLlbizv H9Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XfYTZ+By; 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 bs131-20020a632889000000b004b64146f245si2024841pgb.148.2023.02.20.12.21.48; Mon, 20 Feb 2023 12:22:01 -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=XfYTZ+By; 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 S232870AbjBTUTw (ORCPT + 99 others); Mon, 20 Feb 2023 15:19:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232708AbjBTUTh (ORCPT ); Mon, 20 Feb 2023 15:19:37 -0500 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCD741ABF7 for ; Mon, 20 Feb 2023 12:19:31 -0800 (PST) Received: by mail-pl1-x62e.google.com with SMTP id p1so709786plg.7 for ; Mon, 20 Feb 2023 12:19:31 -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=GH3/jlogTfpFoXcAzPRW2jnyuGq7pnjcvoLksYjq4sE=; b=XfYTZ+By0oTyBykPMBgIQ8w2BaDLmEjDufKm8AVw/lt0U5z5ruHrZUeKTU3szy/M9J CW1diX8EjMccgzM1OAl2X+NeirCyh3D1Kx6Dck3mN/Z8gszeexgGsiTWkz0chz5ez3Dw Rhq/2T4ZKXlQnBY6rImmjZC5vR0QlFtKoo18/tdhF7ZwZI3VmhXRfZQn5cdB+0W3SwKI 7kXy1bEBpUqZaHcNk5AjsXDQFAUaqiPyMQD3VtHdobqID++Qj0MvfTLpLDHz0YR46q0v ET4OLjZq1CjuUeUpfpUGFzLeFovgHKeinXvuEbo6BhPxGtf1KC9R5TXKISMiqHvWfkYu QoHQ== 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=GH3/jlogTfpFoXcAzPRW2jnyuGq7pnjcvoLksYjq4sE=; b=0I3yWsHTYeqOt9J3Z36Wqolj2OvCPfcwUeXJcLag7CFDcN1EHBz/LouPtuTz+OU39F 1B5na56wn2iNV8tBpeJ49a3KIm3awppbNHUBlvUH3IbCOp2bJ98DLBgOw1iDK1L1HebP Zuvn6coIXON+WLeQXp14Pw+F9q7nRc2C3tVJWfpshc4TwbDxvCsCfi/QQE7eo3IKy9Vj 3YdtTs0T02DnWxytZ1q5PL3dY4eSAAGDt4EFBClPNw1TGSFLXdKzTxS637ljzE5lYe7Q LqXP9yOXJGiSBlLNxy0HKEss3Ea1G/I62H2BNhKpz+8Q+Ah2rCAzththPXxzzRM7flyN rk2A== X-Gm-Message-State: AO0yUKWl6qzg7ji3+BUGdxHbo2MYlJelO2Ipkodydcty4yjwf2nmOFCO Ywf59OZUcCRYKtWc8+AySlUKC/eXJ3U= X-Received: by 2002:a17:902:fa0f:b0:19a:73f7:6762 with SMTP id la15-20020a170902fa0f00b0019a73f76762mr4135363plb.52.1676924371334; Mon, 20 Feb 2023 12:19:31 -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 f8-20020a170902684800b0019aa8149cb3sm8314345pln.219.2023.02.20.12.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 12:19:31 -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 , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 09/14] drm/syncobj: Add deadline support for syncobj waits Date: Mon, 20 Feb 2023 12:18:56 -0800 Message-Id: <20230220201916.1822214-10-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?1758382806512505533?= X-GMAIL-MSGID: =?utf-8?q?1758382806512505533?= 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 addjust 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==0 as a way for userspace to probe kernel for support of new flag Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_syncobj.c | 59 +++++++++++++++++++++++++++-------- include/uapi/drm/drm.h | 5 +++ 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 0c2be8360525..4f9c3b3906f1 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -973,7 +973,8 @@ static signed long drm_syncobj_array_wait_timeout(struct 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 +1054,15 @@ static signed long drm_syncobj_array_wait_timeout(struct drm_syncobj **syncobjs, drm_syncobj_fence_add_wait(syncobjs[i], &entries[i]); } + if (deadline) { + for (i = 0; i < count; ++i) { + fence = entries[i].fence; + if (!fence) + continue; + dma_fence_set_deadline(fence, *deadline); + } + } + do { set_current_state(TASK_INTERRUPTIBLE); @@ -1151,7 +1161,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 = 0; uint32_t first = ~0; @@ -1162,7 +1173,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 = first; @@ -1172,7 +1184,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 = first; @@ -1243,17 +1256,22 @@ drm_syncobj_wait_ioctl(struct drm_device *dev, void *data, { struct drm_syncobj_wait *args = data; struct drm_syncobj **syncobjs; + unsigned possible_flags; + ktime_t t, *tp = NULL; int ret = 0; if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) return -EOPNOTSUPP; - if (args->flags & ~(DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT)) + possible_flags = 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; if (args->count_handles == 0) - return -EINVAL; + return 0; ret = drm_syncobj_array_find(file_private, u64_to_user_ptr(args->handles), @@ -1262,8 +1280,13 @@ drm_syncobj_wait_ioctl(struct drm_device *dev, void *data, if (ret < 0) return ret; + if (args->flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE) { + t = ns_to_ktime(args->deadline_ns); + tp = &t; + } + ret = drm_syncobj_array_wait(dev, file_private, - args, NULL, syncobjs, false); + args, NULL, syncobjs, false, tp); drm_syncobj_array_free(syncobjs, args->count_handles); @@ -1276,18 +1299,23 @@ drm_syncobj_timeline_wait_ioctl(struct drm_device *dev, void *data, { struct drm_syncobj_timeline_wait *args = data; struct drm_syncobj **syncobjs; + unsigned possible_flags; + ktime_t t, *tp = NULL; int ret = 0; if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ_TIMELINE)) return -EOPNOTSUPP; - if (args->flags & ~(DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT | - DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE)) + possible_flags = 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; if (args->count_handles == 0) - return -EINVAL; + return -0; ret = drm_syncobj_array_find(file_private, u64_to_user_ptr(args->handles), @@ -1296,8 +1324,13 @@ drm_syncobj_timeline_wait_ioctl(struct drm_device *dev, void *data, if (ret < 0) return ret; + if (args->flags & DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE) { + t = ns_to_ktime(args->deadline_ns); + tp = &t; + } + ret = drm_syncobj_array_wait(dev, file_private, - NULL, args, syncobjs, true); + NULL, args, syncobjs, true, tp); drm_syncobj_array_free(syncobjs, args->count_handles); diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 642808520d92..aefc8cc743e0 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 point to become available */ +#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE (1 << 3) /* set fence deadline based to deadline_nsec/sec */ struct drm_syncobj_wait { __u64 handles; /* absolute timeout */ @@ -895,6 +896,8 @@ struct drm_syncobj_wait { __u32 flags; __u32 first_signaled; /* only valid when not waiting all */ __u32 pad; + /* Deadline hint to set on backing fence(s) in CLOCK_MONOTONIC: */ + __u64 deadline_ns; }; struct drm_syncobj_timeline_wait { @@ -907,6 +910,8 @@ struct drm_syncobj_timeline_wait { __u32 flags; __u32 first_signaled; /* only valid when not waiting all */ __u32 pad; + /* Deadline hint to set on backing fence(s) in CLOCK_MONOTONIC: */ + __u64 deadline_ns; };