[CI 07/42] drm: Move GPUVA_START/LAST to drm_gpuvm.h
Oak Zeng
oak.zeng at intel.com
Thu Jun 13 15:30:53 UTC 2024
Move them to .h file so they can be used outside of drm_gpuvm.c.
Also add a GPUVA_END micro.
Cc: Matthew Brost <matthew.brost at intel.com>
Cc: Thomas Hellström <thomas.hellstrom at intel.com>
Cc: Brian Welty <brian.welty at intel.com>
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>
Signed-off-by: Oak Zeng <oak.zeng at intel.com>
---
drivers/gpu/drm/drm_gpuvm.c | 3 ---
include/drm/drm_gpuvm.h | 4 ++++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c
index f9eb56f24bef..7402ed6f1d33 100644
--- a/drivers/gpu/drm/drm_gpuvm.c
+++ b/drivers/gpu/drm/drm_gpuvm.c
@@ -867,9 +867,6 @@ __drm_gpuvm_bo_list_del(struct drm_gpuvm *gpuvm, spinlock_t *lock,
#define to_drm_gpuva(__node) container_of((__node), struct drm_gpuva, rb.node)
-#define GPUVA_START(node) ((node)->va.addr)
-#define GPUVA_LAST(node) ((node)->va.addr + (node)->va.range - 1)
-
/* We do not actually use drm_gpuva_it_next(), tell the compiler to not complain
* about this.
*/
diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h
index 00d4e43b76b6..429dc0d82eba 100644
--- a/include/drm/drm_gpuvm.h
+++ b/include/drm/drm_gpuvm.h
@@ -38,6 +38,10 @@ struct drm_gpuvm;
struct drm_gpuvm_bo;
struct drm_gpuvm_ops;
+#define GPUVA_START(node) ((node)->va.addr)
+#define GPUVA_LAST(node) ((node)->va.addr + (node)->va.range - 1)
+#define GPUVA_END(node) ((node)->va.addr + (node)->va.range)
+
/**
* enum drm_gpuva_flags - flags for struct drm_gpuva
*/
--
2.26.3
More information about the Intel-xe
mailing list