99 lines
3.2 KiB
Diff
99 lines
3.2 KiB
Diff
From 809ef191ee600e8bcbe2f8a769e00d2d54c16094 Mon Sep 17 00:00:00 2001
|
|
From: Danilo Krummrich <dakr@redhat.com>
|
|
Date: Wed, 8 Nov 2023 01:12:37 +0100
|
|
Subject: [PATCH] drm/gpuvm: add drm_gpuvm_flags to drm_gpuvm
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Introduce flags for struct drm_gpuvm, this required by subsequent
|
|
commits.
|
|
|
|
Acked-by: Christian König <christian.koenig@amd.com>
|
|
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
|
|
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
|
|
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20231108001259.15123-8-dakr@redhat.com
|
|
---
|
|
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(-)
|
|
|
|
--- a/drivers/gpu/drm/drm_gpuvm.c
|
|
+++ b/drivers/gpu/drm/drm_gpuvm.c
|
|
@@ -714,6 +714,7 @@ EXPORT_SYMBOL_GPL(drm_gpuvm_resv_object_
|
|
* 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
|
|
@@ -729,6 +730,7 @@ EXPORT_SYMBOL_GPL(drm_gpuvm_resv_object_
|
|
*/
|
|
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,
|
|
@@ -739,6 +741,7 @@ drm_gpuvm_init(struct drm_gpuvm *gpuvm,
|
|
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;
|
|
--- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c
|
|
+++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c
|
|
@@ -1830,7 +1830,7 @@ nouveau_uvmm_init(struct nouveau_uvmm *u
|
|
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,
|
|
--- a/include/drm/drm_gpuvm.h
|
|
+++ b/include/drm/drm_gpuvm.h
|
|
@@ -185,6 +185,16 @@ static inline bool 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
|
|
*
|
|
* The DRM GPU VA Manager keeps track of a GPU's virtual address space by using
|
|
@@ -203,6 +213,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
|
|
*/
|
|
struct drm_device *drm;
|
|
@@ -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,
|