Merge tag 'drm-next-2024-03-22' of https://gitlab.freedesktop.org/drm/kernel

[sfrench/cifs-2.6.git] / drivers / gpu / drm / xe / xe_vm_types.h

diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.h
index 713996f7dc59f6cceedd3b19228f85c766dd9807..ae5fb565f6bf48d52e29c811a8333793e4e128fd 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm_types.h
+++ b/drivers/gpu/drm/xe/xe_vm_types.h
@@ -19,6 +19,7 @@
 
 struct xe_bo;
 struct xe_sync_entry;
+struct xe_user_fence;
 struct xe_vm;
 
 #define XE_VMA_READ_ONLY       DRM_GPUVA_USERBITS
@@ -102,6 +103,12 @@ struct xe_vma {
         * @pat_index: The pat index to use when encoding the PTEs for this vma.
         */
        u16 pat_index;
+
+       /**
+        * @ufence: The user fence that was provided with MAP.
+        * Needs to be signalled before UNMAP can be processed.
+        */
+       struct xe_user_fence *ufence;
 };
 
 /**
@@ -267,10 +274,6 @@ struct xe_vm {
 struct xe_vma_op_map {
        /** @vma: VMA to map */
        struct xe_vma *vma;
-       /** @immediate: Immediate bind */
-       bool immediate;
-       /** @read_only: Read only */
-       bool read_only;
        /** @is_null: is NULL binding */
        bool is_null;
        /** @dumpable: whether BO is dumped on GPU hang */