From patchwork Wed Sep 20 14:42:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 142577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp4396625vqi; Wed, 20 Sep 2023 13:09:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhxv5Q26JufkHYtqmithWIjeSdJyNOmGZC/bWdUrFAkEVQobkWMSh9MKeVyINzol7V0iPW X-Received: by 2002:a05:6808:1155:b0:3a9:9bcb:8760 with SMTP id u21-20020a056808115500b003a99bcb8760mr4178447oiu.39.1695240594998; Wed, 20 Sep 2023 13:09:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695240594; cv=none; d=google.com; s=arc-20160816; b=skO83KJ47B8iX0pNK5HHB807auo1jzQWP2aD4bgqhHa6R9QetI5Dtgz+FqhNZ7TK7b 8CDAz7zq75v03BPFW30uvozZjyJptesGBtCONSGr0wAKso/ctx7/gO0u8hYYexCpLMRV MbOel7GQKbRUQyJ/kqWohQzhncFELVRMOk5Y+GxRTyuUkrX6mSvDiTKl1OkJxvV8V7ei FtZ9bsiiOBOUNEsQd9B6vmFD/vQA9z5NywbCGtbsTVmk8uVgc96S3TUET/rb8QylZACQ qZkVOx54aEtFEgs0bKp8G19+H2X22TWvjDgGg6mBqyhWeqOJhsvZ+8nQC+fTGEJgMMbf JcxA== 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=Ghz5knkCxzrSi2vq7w57fAFMpmuxZabaEm5qht4/DxU=; fh=dwkrUexBTyIzqDIYfr1juzyRJB3CVRterGzuZbbJmkY=; b=FEAdXoNS8trqM7LeRWn9Rg805ZCi0VVmAHgV6eV688U8GS3vZp+5Ae593X3SOdBfbu NCMobL3jztVjzN0IGZFLqbhyNU/HQ4jmTzSQ1fBge2DZ+oVsULgf8lwdhraVt5Aa5qDL 2nU/j/eeGVPnDbi5H0yKtYsoRlWVW8tExoP9P+uNkMX2uTD8Zn3wvwfPAME8+WjRJlxv jTpkuAi0kSL+q6DCm4wfyu2wFBdAP3v7BQYwCEKvQJyNv4lUSWZ7cPeAnjBNd1VKj+ue a5k9TvqXgRYIxjU+FVQZvdK5dgLLsaREP0HIPu/IfzvG5L+DVwtgp3nMTF5AqGSrPLgE JgBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=S+QqMbTx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id w10-20020a056a0014ca00b006896e2f30f2si12776183pfu.365.2023.09.20.13.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 13:09:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=S+QqMbTx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id D14F48023740; Wed, 20 Sep 2023 07:46:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235005AbjITOpn (ORCPT + 27 others); Wed, 20 Sep 2023 10:45:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236793AbjITOpF (ORCPT ); Wed, 20 Sep 2023 10:45:05 -0400 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 4F5C6E4 for ; Wed, 20 Sep 2023 07:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695221055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ghz5knkCxzrSi2vq7w57fAFMpmuxZabaEm5qht4/DxU=; b=S+QqMbTx73IEXdADipk0sABa6jBqlCsT4SCVRyPOGJWc0iONEGMwLFcGNoJudtqkoMR7zI OYi/PqAYVT4dSvK8Y0Q5QSLp6WQwfMOoKESnUtQhqI5Er6TdMg4rQaD7vCtwDU60b9qcd/ 1I14E5BmxbWzJP876C+NAkd2TcLCM60= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-303-TdPsdbiDPiS_8t0o6jp-cA-1; Wed, 20 Sep 2023 10:44:13 -0400 X-MC-Unique: TdPsdbiDPiS_8t0o6jp-cA-1 Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2bfeaf8cc4bso57513011fa.0 for ; Wed, 20 Sep 2023 07:44:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695221052; x=1695825852; 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=Ghz5knkCxzrSi2vq7w57fAFMpmuxZabaEm5qht4/DxU=; b=SMRoejTTknVK5DvswhvX3j8XxZnJ1S5AgnyZn65R4FXk5cNReaXjDh1h+hM6cwHzMl +cELVRQksjUcY7i0EXpJtW0Qm7i+G3ZLsHpyKF8mMX2uEpG2Z2hMWiIXTXsfrVSk9vhr CIXLYqJQaMz4798BHvHZZA5HTWVmh3I21AZ1QbxnhzsT+Sy2kkm8o+Ikt8MRM6LatjDs NpWxzkSqy6Kfhc1nJkerZA+41aLuxoc4TzqrfzRJIgs1nL7f5+I/FQdqN1x41Zte/xXG PL2AkscY64E4nK6ohX9Oq9qbkUwI1y0rtIDnUqdBJKA8EEMqaLtI+eusmhOtjbElVFt4 Dhtg== X-Gm-Message-State: AOJu0YwXg9jz5starmAX3BfHQCGvnQh+cv5J7Vn4l4kk7xklrEPeXwq5 dszr+3ZfYkj1Hn/pPQA7wm0OuLtw0DRcvhQK5CesbVLZbF2P4WQ0OS25ugQe0uYL+d3I2wxQ9tf klDvKYXby8J9gHPxFt0rJWWmZ X-Received: by 2002:a2e:a404:0:b0:2b6:a827:164f with SMTP id p4-20020a2ea404000000b002b6a827164fmr2402868ljn.10.1695221052490; Wed, 20 Sep 2023 07:44:12 -0700 (PDT) X-Received: by 2002:a2e:a404:0:b0:2b6:a827:164f with SMTP id p4-20020a2ea404000000b002b6a827164fmr2402846ljn.10.1695221052202; Wed, 20 Sep 2023 07:44:12 -0700 (PDT) Received: from cassiopeiae.. ([2a02:810d:4b3f:de9c:642:1aff:fe31:a19f]) by smtp.gmail.com with ESMTPSA id n19-20020a170906165300b009ad75d318ffsm9680291ejd.17.2023.09.20.07.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 07:44:11 -0700 (PDT) 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.ekstrand@collabora.com Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next v4 6/8] drm/gpuvm: add drm_gpuvm_flags to drm_gpuvm Date: Wed, 20 Sep 2023 16:42:39 +0200 Message-ID: <20230920144343.64830-7-dakr@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230920144343.64830-1-dakr@redhat.com> References: <20230920144343.64830-1-dakr@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email 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 (pete.vger.email [0.0.0.0]); Wed, 20 Sep 2023 07:46:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777588602402104207 X-GMAIL-MSGID: 1777588602402104207 Introduce flags for struct drm_gpuvm, this required by subsequent commits. 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 | 17 ++++++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c index 6ee224e1121e..6e9d2d478bb8 100644 --- a/drivers/gpu/drm/drm_gpuvm.c +++ b/drivers/gpu/drm/drm_gpuvm.c @@ -705,7 +705,7 @@ drm_gpuva_range_valid(struct drm_gpuvm *gpuvm, */ void drm_gpuvm_init(struct drm_gpuvm *gpuvm, struct drm_device *drm, - const char *name, + const char *name, enum drm_gpuva_flags flags, u64 start_offset, u64 range, u64 reserve_offset, u64 reserve_range, const struct drm_gpuvm_ops *ops) @@ -718,6 +718,7 @@ drm_gpuvm_init(struct drm_gpuvm *gpuvm, struct drm_device *drm, gpuvm->mm_range = range; gpuvm->name = name ? name : "unknown"; + gpuvm->flags = flags; gpuvm->ops = ops; memset(&gpuvm->kernel_alloc_node, 0, sizeof(struct drm_gpuva)); diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c b/drivers/gpu/drm/nouveau/nouveau_uvmm.c index cf709afd2ac7..3de8533841db 100644 --- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c +++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c @@ -1864,7 +1864,7 @@ nouveau_uvmm_init(struct nouveau_uvmm *uvmm, struct nouveau_cli *cli, uvmm->kernel_managed_addr = kernel_managed_addr; uvmm->kernel_managed_size = kernel_managed_size; - drm_gpuvm_init(&uvmm->base, cli->drm->dev, cli->name, + drm_gpuvm_init(&uvmm->base, cli->drm->dev, cli->name, 0, 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 2c9ad6eb9401..f57ad1f0f0d0 100644 --- a/include/drm/drm_gpuvm.h +++ b/include/drm/drm_gpuvm.h @@ -192,6 +192,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 = (1 << 0), +}; + /** * struct drm_gpuvm - DRM GPU VA Manager * @@ -210,6 +220,11 @@ struct drm_gpuvm { */ const char *name; + /** + * @flags: the &drm_gpuvm_flags of this GPUVM + */ + enum drm_gpuva_flags flags; + /** * @mm_start: start of the VA space */ @@ -256,7 +271,7 @@ struct drm_gpuvm { }; void drm_gpuvm_init(struct drm_gpuvm *gpuvm, struct drm_device *drm, - const char *name, + const char *name, enum drm_gpuva_flags flags, u64 start_offset, u64 range, u64 reserve_offset, u64 reserve_range, const struct drm_gpuvm_ops *ops);