143 lines
4.8 KiB
Diff
143 lines
4.8 KiB
Diff
From e759f2ca29d918d3db57a61cdf838025beb03465 Mon Sep 17 00:00:00 2001
|
|
From: Danilo Krummrich <dakr@redhat.com>
|
|
Date: Wed, 29 Nov 2023 23:08:00 +0100
|
|
Subject: [PATCH] drm/gpuvm: fall back to drm_exec_lock_obj()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Fall back to drm_exec_lock_obj() if num_fences is zero for the
|
|
drm_gpuvm_prepare_* function family.
|
|
|
|
Otherwise dma_resv_reserve_fences() would actually allocate slots even
|
|
though num_fences is zero.
|
|
|
|
Cc: Christian König <christian.koenig@amd.com>
|
|
Acked-by: Donald Robson <donald.robson@imgtec.com>
|
|
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20231129220835.297885-2-dakr@redhat.com
|
|
---
|
|
drivers/gpu/drm/drm_gpuvm.c | 43 ++++++++++++++++++++++++++++++++-----
|
|
include/drm/drm_gpuvm.h | 23 +++-----------------
|
|
2 files changed, 41 insertions(+), 25 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/drm_gpuvm.c
|
|
+++ b/drivers/gpu/drm/drm_gpuvm.c
|
|
@@ -1080,6 +1080,37 @@ drm_gpuvm_put(struct drm_gpuvm *gpuvm)
|
|
EXPORT_SYMBOL_GPL(drm_gpuvm_put);
|
|
|
|
static int
|
|
+exec_prepare_obj(struct drm_exec *exec, struct drm_gem_object *obj,
|
|
+ unsigned int num_fences)
|
|
+{
|
|
+ return num_fences ? drm_exec_prepare_obj(exec, obj, num_fences) :
|
|
+ drm_exec_lock_obj(exec, obj);
|
|
+}
|
|
+
|
|
+/**
|
|
+ * drm_gpuvm_prepare_vm() - prepare the GPUVMs common dma-resv
|
|
+ * @gpuvm: the &drm_gpuvm
|
|
+ * @exec: the &drm_exec context
|
|
+ * @num_fences: the amount of &dma_fences to reserve
|
|
+ *
|
|
+ * Calls drm_exec_prepare_obj() for the GPUVMs dummy &drm_gem_object; if
|
|
+ * @num_fences is zero drm_exec_lock_obj() is called instead.
|
|
+ *
|
|
+ * Using this function directly, it is the drivers responsibility to call
|
|
+ * drm_exec_init() and drm_exec_fini() accordingly.
|
|
+ *
|
|
+ * Returns: 0 on success, negative error code on failure.
|
|
+ */
|
|
+int
|
|
+drm_gpuvm_prepare_vm(struct drm_gpuvm *gpuvm,
|
|
+ struct drm_exec *exec,
|
|
+ unsigned int num_fences)
|
|
+{
|
|
+ return exec_prepare_obj(exec, gpuvm->r_obj, num_fences);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(drm_gpuvm_prepare_vm);
|
|
+
|
|
+static int
|
|
__drm_gpuvm_prepare_objects(struct drm_gpuvm *gpuvm,
|
|
struct drm_exec *exec,
|
|
unsigned int num_fences)
|
|
@@ -1089,7 +1120,7 @@ __drm_gpuvm_prepare_objects(struct drm_g
|
|
int ret = 0;
|
|
|
|
for_each_vm_bo_in_list(gpuvm, extobj, &extobjs, vm_bo) {
|
|
- ret = drm_exec_prepare_obj(exec, vm_bo->obj, num_fences);
|
|
+ ret = exec_prepare_obj(exec, vm_bo->obj, num_fences);
|
|
if (ret)
|
|
break;
|
|
}
|
|
@@ -1110,7 +1141,7 @@ drm_gpuvm_prepare_objects_locked(struct
|
|
|
|
drm_gpuvm_resv_assert_held(gpuvm);
|
|
list_for_each_entry(vm_bo, &gpuvm->extobj.list, list.entry.extobj) {
|
|
- ret = drm_exec_prepare_obj(exec, vm_bo->obj, num_fences);
|
|
+ ret = exec_prepare_obj(exec, vm_bo->obj, num_fences);
|
|
if (ret)
|
|
break;
|
|
|
|
@@ -1128,7 +1159,8 @@ drm_gpuvm_prepare_objects_locked(struct
|
|
* @num_fences: the amount of &dma_fences to reserve
|
|
*
|
|
* Calls drm_exec_prepare_obj() for all &drm_gem_objects the given
|
|
- * &drm_gpuvm contains mappings of.
|
|
+ * &drm_gpuvm contains mappings of; if @num_fences is zero drm_exec_lock_obj()
|
|
+ * is called instead.
|
|
*
|
|
* Using this function directly, it is the drivers responsibility to call
|
|
* drm_exec_init() and drm_exec_fini() accordingly.
|
|
@@ -1165,7 +1197,8 @@ EXPORT_SYMBOL_GPL(drm_gpuvm_prepare_obje
|
|
* @num_fences: the amount of &dma_fences to reserve
|
|
*
|
|
* Calls drm_exec_prepare_obj() for all &drm_gem_objects mapped between @addr
|
|
- * and @addr + @range.
|
|
+ * and @addr + @range; if @num_fences is zero drm_exec_lock_obj() is called
|
|
+ * instead.
|
|
*
|
|
* Returns: 0 on success, negative error code on failure.
|
|
*/
|
|
@@ -1180,7 +1213,7 @@ drm_gpuvm_prepare_range(struct drm_gpuvm
|
|
drm_gpuvm_for_each_va_range(va, gpuvm, addr, end) {
|
|
struct drm_gem_object *obj = va->gem.obj;
|
|
|
|
- ret = drm_exec_prepare_obj(exec, obj, num_fences);
|
|
+ ret = exec_prepare_obj(exec, obj, num_fences);
|
|
if (ret)
|
|
return ret;
|
|
}
|
|
--- a/include/drm/drm_gpuvm.h
|
|
+++ b/include/drm/drm_gpuvm.h
|
|
@@ -544,26 +544,9 @@ struct drm_gpuvm_exec {
|
|
} extra;
|
|
};
|
|
|
|
-/**
|
|
- * drm_gpuvm_prepare_vm() - prepare the GPUVMs common dma-resv
|
|
- * @gpuvm: the &drm_gpuvm
|
|
- * @exec: the &drm_exec context
|
|
- * @num_fences: the amount of &dma_fences to reserve
|
|
- *
|
|
- * Calls drm_exec_prepare_obj() for the GPUVMs dummy &drm_gem_object.
|
|
- *
|
|
- * Using this function directly, it is the drivers responsibility to call
|
|
- * drm_exec_init() and drm_exec_fini() accordingly.
|
|
- *
|
|
- * Returns: 0 on success, negative error code on failure.
|
|
- */
|
|
-static inline int
|
|
-drm_gpuvm_prepare_vm(struct drm_gpuvm *gpuvm,
|
|
- struct drm_exec *exec,
|
|
- unsigned int num_fences)
|
|
-{
|
|
- return drm_exec_prepare_obj(exec, gpuvm->r_obj, num_fences);
|
|
-}
|
|
+int drm_gpuvm_prepare_vm(struct drm_gpuvm *gpuvm,
|
|
+ struct drm_exec *exec,
|
|
+ unsigned int num_fences);
|
|
|
|
int drm_gpuvm_prepare_objects(struct drm_gpuvm *gpuvm,
|
|
struct drm_exec *exec,
|