From patchwork Wed Nov 8 00:12:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 162824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp599635vqo; Tue, 7 Nov 2023 16:14:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMZA/X4KeHEerpxt9xNrrnFRv/s+kntgBx891N4wRSss8hXuSa4zPc+gTZH3MemIHvOzuz X-Received: by 2002:a05:6a00:1397:b0:6be:1f19:e604 with SMTP id t23-20020a056a00139700b006be1f19e604mr275863pfg.21.1699402461185; Tue, 07 Nov 2023 16:14:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699402461; cv=none; d=google.com; s=arc-20160816; b=WP3Gxh2EhgATaV6nEU70hKU5raf511uCVnvayuRWWOjo5RLbhzR1awEtgPWG5+c+g7 zEN2u1T2IX6nNnDJcOpkDzcDKK55ECh3tcCW7nijU10jIOWQVc+UgRMLwe1c12+yWi+t t9uORZZjX/lVrilQU80uGGnGANooCbYeybb9jFCy990H8aMyVVfqQfqFbjCEiD2vd54u gS6wxzUu4ClrEcBjF56Qh0wj50yilTd1Xzgg52uMUso4UWxahpn42ycF34xiykdSgOfn z93pdCbNKm8UH5uQfQDpgt86RYa6YZnMF0CIwuLEtvK+H9KGgpPQdRYyI5XCGwMcigvc 3KZA== 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=RXgqRC5/5tCXBERwm7aEPSo0YVJhEAXXDD4zWhliPJ8=; fh=8dtrvlz6eC1As92HJPwYWdp8qGhbMzdOhqcu6vG4iUM=; b=F+QibjemlUoCigHtNm/8cQFxhex/8+8DcmPc2mSbtF904GVSMPEU8jrCbdRCcj0WR5 wVP6WMacqVJV8wkyfwNxTNAjTgohmYen+mNK7H9vYtvOl3OcJ8aHDdvmfuDBqsEw/qLE uw3caOf4rK8vIzMxbWCz+Woeyhm40dZooYJutUhF8eqDGPDEiPfmDJfF49aMGURp3MW8 3OE6gecNVc6n5pBrMG+X8KtY3VmXGgOf20ROpTBjedg+m6S0jWMebX7x3DIf1Ezd7jRO mBWGJ49vfPF3uUCxxenz0zJAk9JIHXHaOgEv9Lh5tF7QJrQw4yL+rWXnPP/GNIZ68lm5 SuZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PDD+0xWE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id ea20-20020a056a004c1400b006be044f21efsi12065685pfb.362.2023.11.07.16.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 16:14:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PDD+0xWE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 7987282ECB36; Tue, 7 Nov 2023 16:14:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344129AbjKHAON (ORCPT + 32 others); Tue, 7 Nov 2023 19:14:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235363AbjKHAOH (ORCPT ); Tue, 7 Nov 2023 19:14:07 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0CF010F8 for ; Tue, 7 Nov 2023 16:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699402411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RXgqRC5/5tCXBERwm7aEPSo0YVJhEAXXDD4zWhliPJ8=; b=PDD+0xWE9u3fgR9NRNGZ42azzUQbqt3F1nxf+fSEuxSVq74my/2K0mTXOHPQbKLMJp5zM7 FIpfizaw9vZHm6rq0Ygw8KY2HsqHlTWotkINgRBnuPcFbAZWEQfhlkZxL62dzRjmR2TKIV od3ZEgccQ38ubP7x3YmUI1QjdgUb84A= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-53-JKrgXEw5OvmCZpoFmxZuRw-1; Tue, 07 Nov 2023 19:13:29 -0500 X-MC-Unique: JKrgXEw5OvmCZpoFmxZuRw-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9e15f05c3ceso165375366b.3 for ; Tue, 07 Nov 2023 16:13:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699402408; x=1700007208; 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=RXgqRC5/5tCXBERwm7aEPSo0YVJhEAXXDD4zWhliPJ8=; b=nGr54KQqB5XgO3ooppEhYs35TAbsONBd0VjmK9zL/BkazT8ugez0kkzdd8tOXC6dvD GKF0f5mg1w/OXynZEalVfSc/W73DubzgOr1VKDb0wYrXYIlmFaSygGs3ggvj03h7ZX5T 3HVn0e/cpHNChTtMc5EuIHqumMn9m5szA0ywGUuQQhA6dH7jd+QrCmF+bO2/C28P19xP e0kyDAw9TBiejViFSHpBY/Ger4pMhf5rNlOhUiuLCs4/YBdPy/phOstZHPvyuqKbJUwg ZBcnDSe5MQgVxaaoaQYkYAFXP2HWMpC40IKssJvn3pvNZbrur9B16V2sPvlPjhc/xmxk 5Few== X-Gm-Message-State: AOJu0YzubyDteyyTZ6TMLYqM6ACJ27rR2vwvfpXHfuwBeb+vk6xpbZax yM49ptsDYgrXU+4C2yfo6zNuitzZ6HADt07wIb8vKYqSSZ7Jwo3slHViI16QItzXpRXUubL/Id9 oV0yQJBY6NZuu8MJjJ+vlF+KG X-Received: by 2002:a17:907:9692:b0:9c0:99c4:79e8 with SMTP id hd18-20020a170907969200b009c099c479e8mr133157ejc.6.1699402408503; Tue, 07 Nov 2023 16:13:28 -0800 (PST) X-Received: by 2002:a17:907:9692:b0:9c0:99c4:79e8 with SMTP id hd18-20020a170907969200b009c099c479e8mr133146ejc.6.1699402408354; Tue, 07 Nov 2023 16:13:28 -0800 (PST) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id c10-20020a170906d18a00b009a1a653770bsm177102ejz.87.2023.11.07.16.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 16:13:28 -0800 (PST) From: Danilo Krummrich To: airlied@gmail.com, daniel@ffwll.ch, matthew.brost@intel.com, thomas.hellstrom@linux.intel.com, sarah.walker@imgtec.com, donald.robson@imgtec.com, boris.brezillon@collabora.com, christian.koenig@amd.com, faith@gfxstrand.net Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next v9 07/12] drm/gpuvm: add drm_gpuvm_flags to drm_gpuvm Date: Wed, 8 Nov 2023 01:12:37 +0100 Message-ID: <20231108001259.15123-8-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231108001259.15123-1-dakr@redhat.com> References: <20231108001259.15123-1-dakr@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 07 Nov 2023 16:14:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781952634619102826 X-GMAIL-MSGID: 1781952634619102826 Introduce flags for struct drm_gpuvm, this required by subsequent commits. Reviewed-by: Boris Brezillon Reviewed-by: Thomas Hellström Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/drm_gpuvm.c | 3 +++ drivers/gpu/drm/nouveau/nouveau_uvmm.c | 2 +- include/drm/drm_gpuvm.h | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c index af5805e4d7c9..53e2c406fb04 100644 --- a/drivers/gpu/drm/drm_gpuvm.c +++ b/drivers/gpu/drm/drm_gpuvm.c @@ -720,6 +720,7 @@ EXPORT_SYMBOL_GPL(drm_gpuvm_resv_object_alloc); * drm_gpuvm_init() - initialize a &drm_gpuvm * @gpuvm: pointer to the &drm_gpuvm to initialize * @name: the name of the GPU VA space + * @flags: the &drm_gpuvm_flags for this GPUVM * @drm: the &drm_device this VM resides in * @r_obj: the resv &drm_gem_object providing the GPUVM's common &dma_resv * @start_offset: the start offset of the GPU VA space @@ -735,6 +736,7 @@ EXPORT_SYMBOL_GPL(drm_gpuvm_resv_object_alloc); */ void drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, + enum drm_gpuvm_flags flags, struct drm_device *drm, struct drm_gem_object *r_obj, u64 start_offset, u64 range, @@ -745,6 +747,7 @@ drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, INIT_LIST_HEAD(&gpuvm->rb.list); gpuvm->name = name ? name : "unknown"; + gpuvm->flags = flags; gpuvm->ops = ops; gpuvm->drm = drm; gpuvm->r_obj = r_obj; diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c b/drivers/gpu/drm/nouveau/nouveau_uvmm.c index 8977a518de96..f765e3835306 100644 --- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c +++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c @@ -1828,7 +1828,7 @@ nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli, goto out_unlock; } - drm_gpuvm_init(&uvmm->base, cli->name, drm, r_obj, + drm_gpuvm_init(&uvmm->base, cli->name, 0, drm, r_obj, NOUVEAU_VA_SPACE_START, NOUVEAU_VA_SPACE_END, kernel_managed_addr, kernel_managed_size, diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h index ff3377cbfe52..0c2e24155a93 100644 --- a/include/drm/drm_gpuvm.h +++ b/include/drm/drm_gpuvm.h @@ -184,6 +184,16 @@ static inline bool drm_gpuva_invalidated(struct drm_gpuva *va) return va->flags & DRM_GPUVA_INVALIDATED; } +/** + * enum drm_gpuvm_flags - flags for struct drm_gpuvm + */ +enum drm_gpuvm_flags { + /** + * @DRM_GPUVM_USERBITS: user defined bits + */ + DRM_GPUVM_USERBITS = BIT(0), +}; + /** * struct drm_gpuvm - DRM GPU VA Manager * @@ -202,6 +212,11 @@ struct drm_gpuvm { */ const char *name; + /** + * @flags: the &drm_gpuvm_flags of this GPUVM + */ + enum drm_gpuvm_flags flags; + /** * @drm: the &drm_device this VM lives in */ @@ -252,6 +267,7 @@ struct drm_gpuvm { }; void drm_gpuvm_init(struct drm_gpuvm *gpuvm, const char *name, + enum drm_gpuvm_flags flags, struct drm_device *drm, struct drm_gem_object *r_obj, u64 start_offset, u64 range,