From patchwork Mon Feb 20 20:19:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 59659 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1496315wrn; Mon, 20 Feb 2023 12:22:31 -0800 (PST) X-Google-Smtp-Source: AK7set/+aRclSI5wcQFKEvVmr5WWOxdvR1gGM4EGtFt39mNujaoSFbUPyMZgJe4wttnRTd/mcWXs X-Received: by 2002:a05:6a21:78a0:b0:c7:73de:5aa7 with SMTP id bf32-20020a056a2178a000b000c773de5aa7mr16669805pzc.43.1676924551310; Mon, 20 Feb 2023 12:22:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676924551; cv=none; d=google.com; s=arc-20160816; b=C6ivfrvZ73TLB4boOoBqxkNIFZpXkm/PwZntq6yRkbtoKCh0nTj90OxCqC9Dfh0nr+ d1D0Yh5+T7HSZivGz2FUFPbtB1K8GSzUzIkIdu9ptigM3RUd84yNOXxc5rczzoM4g7nt 0C1wA9+VbTHhqVM+qGPQurss4arUvFMJ3DWXciQou4KvkBbR2/QmTlOHlDSfMt32DG8V uStc/KNQzbCpgK958b00iSG0GoeoPv145JPDbD1fpCkOzlAw3RoNZv7BNXPETXJegOEQ BoZy3jlzdIdiMSc14XvCjUQjQ6Bs77t6o1BW3+nfheAX4oiM6OtthNg+HSPbbYxTyMXH HbIA== 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=0EqwRq/t+KHhVrbIAD1sooBDZlG3nzxQWus7/my7j0s=; b=zWfhCGePl1K4L3dBtBdQCbA1lUTZ3PKiXEW+KCNn7Kn8JZlu2wxQgMjCx2POQpuxs5 o21ga1i2wEjZXD2oATFCJPJ1zjVELf95RfGdOLCwcIpMKaAUEc5DfJw+X9m9Tg5KM+kt GdPMswULVRuQs9Xj1ckhu4aA3DC9i+QjKKyKtrzKCwoFCHFXT6Dw1+JoAIqdMIatOocD +84u5tW1EpwD3gzvdO7m+nLXtQHm0IXlDdZpIJ/02W0qIDy9X2oYwBTpUp1nqGqO16Yk qcBX698u3wpfpZNn8glfoBdE8of9deHbmJYKWuD665czXCFnQhaDEyX29XieKAEVvNL2 6SPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=TG1L6nn0; 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 r18-20020a63a552000000b00502d60b07fasi595863pgu.127.2023.02.20.12.22.18; Mon, 20 Feb 2023 12:22:31 -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=TG1L6nn0; 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 S232813AbjBTUUR (ORCPT + 99 others); Mon, 20 Feb 2023 15:20:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232837AbjBTUTv (ORCPT ); Mon, 20 Feb 2023 15:19:51 -0500 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A738A1ABC2; Mon, 20 Feb 2023 12:19:37 -0800 (PST) Received: by mail-pg1-x536.google.com with SMTP id 132so1154979pgh.13; Mon, 20 Feb 2023 12:19:37 -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=0EqwRq/t+KHhVrbIAD1sooBDZlG3nzxQWus7/my7j0s=; b=TG1L6nn0mxBlkKBusgwF9MyUCLhHqNTRGOpIiG1+g3+2tbfhq1+DgZUgf4V2KgyNra ENmsUIrjwSSr/A4fn2O9l0F3MUhpCSjJtle6DdruoB8wDezXrbM/gFxXxsBj+dKQf7wl t58P0IMFe+/PCrMmuzStSrS2BkDx3+ndckjxibW/670yzJO914kwBw1L36j4S6OBCdFX LMghJVaa4OPP2iw1qmcJ/x2VEoL4CshIZq34uHqcHASQqYllJCpFEUIWmu/aWIf191bB sXM4DUz8HMGVQHyxzvIsP3fnLQ6VDkpu2myvqfAULLrqWH82Ig+GhmOU3J7uGsCS1mde qLtA== 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=0EqwRq/t+KHhVrbIAD1sooBDZlG3nzxQWus7/my7j0s=; b=5SUfvQGUK9cyUL5jOxtv2W08Ho7kHgvwNxDsTqxOiXQzN0p2VC6oqHqV5Obl424oSq XGvFGqzVBdi2C2JZqz/OWZOlqb4H1rEqu864kZ3bx6n5thWCtYT3R1MO20kcW1WRieg7 nDSvWYoLj+hJalDCffa/zDglgm6M45ZRCUy1UXFWWtuONS5gV72h9Oo5YWcluA1n8y35 QmPkb3E59tkYaxaawoKSYqUzbgMhI4IV/+zQgvPbH5id2vjw7st5rv+ym9A+8zPDPAsw HDbS8cMwQ5G7xrw26MtEjJb8wqkli78wrY44W/0FvSKLvbPAGUTvQnpAQHOkQWHrhu3v f4NA== X-Gm-Message-State: AO0yUKXgGg/eNz95B0WXtVt6HguU9d761DF4jDlltuxoFJ4cG25u6/qU EHlHZTeRtRD+oaCzy9CW1zM= X-Received: by 2002:a05:6a00:9b:b0:5a8:a263:7f4d with SMTP id c27-20020a056a00009b00b005a8a2637f4dmr2306138pfj.15.1676924376984; Mon, 20 Feb 2023 12:19:36 -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 c11-20020aa781cb000000b005a8bc154bf4sm2440630pfn.39.2023.02.20.12.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 12:19:36 -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 , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM ADRENO GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 13/14] drm/msm: Add wait-boost support Date: Mon, 20 Feb 2023 12:19:00 -0800 Message-Id: <20230220201916.1822214-14-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?1758382838373624416?= X-GMAIL-MSGID: =?utf-8?q?1758382838373624416?= From: Rob Clark Add a way for various userspace waits to signal urgency. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_drv.c | 12 ++++++++---- drivers/gpu/drm/msm/msm_gem.c | 5 +++++ include/uapi/drm/msm_drm.h | 14 ++++++++++++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index aca48c868c14..f6764a86b2da 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -46,6 +46,7 @@ * - 1.8.0 - Add MSM_BO_CACHED_COHERENT for supported GPUs (a6xx) * - 1.9.0 - Add MSM_SUBMIT_FENCE_SN_IN * - 1.10.0 - Add MSM_SUBMIT_BO_NO_IMPLICIT + * - 1.11.0 - Add wait boost (MSM_WAIT_FENCE_BOOST, MSM_PREP_BOOST) */ #define MSM_VERSION_MAJOR 1 #define MSM_VERSION_MINOR 10 @@ -899,7 +900,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, } static int wait_fence(struct msm_gpu_submitqueue *queue, uint32_t fence_id, - ktime_t timeout) + ktime_t timeout, uint32_t flags) { struct dma_fence *fence; int ret; @@ -929,6 +930,9 @@ static int wait_fence(struct msm_gpu_submitqueue *queue, uint32_t fence_id, if (!fence) return 0; + if (flags & MSM_WAIT_FENCE_BOOST) + dma_fence_set_deadline(fence, ktime_get()); + ret = dma_fence_wait_timeout(fence, true, timeout_to_jiffies(&timeout)); if (ret == 0) { ret = -ETIMEDOUT; @@ -949,8 +953,8 @@ static int msm_ioctl_wait_fence(struct drm_device *dev, void *data, struct msm_gpu_submitqueue *queue; int ret; - if (args->pad) { - DRM_ERROR("invalid pad: %08x\n", args->pad); + if (args->flags & ~MSM_WAIT_FENCE_FLAGS) { + DRM_ERROR("invalid flags: %08x\n", args->flags); return -EINVAL; } @@ -961,7 +965,7 @@ static int msm_ioctl_wait_fence(struct drm_device *dev, void *data, if (!queue) return -ENOENT; - ret = wait_fence(queue, args->fence, to_ktime(args->timeout)); + ret = wait_fence(queue, args->fence, to_ktime(args->timeout), args->flags); msm_submitqueue_put(queue); diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 1dee0d18abbb..dd4a0d773f6e 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -846,6 +846,11 @@ int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, ktime_t *timeout) op & MSM_PREP_NOSYNC ? 0 : timeout_to_jiffies(timeout); long ret; + if (op & MSM_PREP_BOOST) { + dma_resv_set_deadline(obj->resv, dma_resv_usage_rw(write), + ktime_get()); + } + ret = dma_resv_wait_timeout(obj->resv, dma_resv_usage_rw(write), true, remain); if (ret == 0) diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index 329100016e7c..dbf0d6f43fa9 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -151,8 +151,13 @@ struct drm_msm_gem_info { #define MSM_PREP_READ 0x01 #define MSM_PREP_WRITE 0x02 #define MSM_PREP_NOSYNC 0x04 +#define MSM_PREP_BOOST 0x08 -#define MSM_PREP_FLAGS (MSM_PREP_READ | MSM_PREP_WRITE | MSM_PREP_NOSYNC) +#define MSM_PREP_FLAGS (MSM_PREP_READ | \ + MSM_PREP_WRITE | \ + MSM_PREP_NOSYNC | \ + MSM_PREP_BOOST | \ + 0) struct drm_msm_gem_cpu_prep { __u32 handle; /* in */ @@ -286,6 +291,11 @@ struct drm_msm_gem_submit { }; +#define MSM_WAIT_FENCE_BOOST 0x00000001 +#define MSM_WAIT_FENCE_FLAGS ( \ + MSM_WAIT_FENCE_BOOST | \ + 0) + /* The normal way to synchronize with the GPU is just to CPU_PREP on * a buffer if you need to access it from the CPU (other cmdstream * submission from same or other contexts, PAGE_FLIP ioctl, etc, all @@ -295,7 +305,7 @@ struct drm_msm_gem_submit { */ struct drm_msm_wait_fence { __u32 fence; /* in */ - __u32 pad; + __u32 flags; /* in, bitmask of MSM_WAIT_FENCE_x */ struct drm_msm_timespec timeout; /* in */ __u32 queueid; /* in, submitqueue id */ };