[PATCH v10 20/27] drm/xe/pagefault: export pagefault queue properties

[Mika Kuoppala <mika.kuoppala@linux.intel.com>]

From: Maciej Patelczyk <maciej.patelczyk@intel.com>

Export pagefault queue related properties for eudebug.

Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 drivers/gpu/drm/xe/xe_pagefault.c       | 44 -------------------------
 drivers/gpu/drm/xe/xe_pagefault.h       | 10 ++++++
 drivers/gpu/drm/xe/xe_pagefault_types.h | 34 +++++++++++++++++++
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_pagefault.c b/drivers/gpu/drm/xe/xe_pagefault.c
index 2e415995f067..27c3a90e4e73 100644
--- a/drivers/gpu/drm/xe/xe_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_pagefault.c
@@ -70,49 +70,6 @@
  * free state once they are complete.
  */
 
-/**
- * enum xe_pagefault_alloc_state - lifetime state for a page fault queue entry
- * @XE_PAGEFAULT_ALLOC_STATE_FREE:
- *	Entry is unused and may be overwritten by the producer, consumer retry
- *	or requeue..
- * @XE_PAGEFAULT_ALLOC_STATE_QUEUED:
- *	Entry has been enqueued and may be dequeued by a worker.
- * @XE_PAGEFAULT_ALLOC_STATE_ACTIVE:
- *	Entry has been dequeued and is the worker's currently serviced fault.
- *	The worker may attach additional faults to it via consumer.next.
- * @XE_PAGEFAULT_ALLOC_STATE_CHAINED:
- *	Entry is not independently serviced; it has been chained onto an
- *	ACTIVE entry via consumer.next and will be acknowledged when the
- *	leading fault completes.
- * @XE_PAGEFAULT_ALLOC_STATE_COUNT:
- *	Count of allocation states.
- *
- * The page fault queue provides stable storage for outstanding faults so the
- * IRQ handler can chain new cache hits directly onto a worker's active fault.
- * Because entries may remain referenced outside the consumer dequeue window,
- * the producer must only write into entries in the FREE state.
- *
- * State transitions are protected by the page fault queue lock. Workers return
- * entries to FREE after acknowledging the fault (either as ACTIVE or CHAINED).
- */
-enum xe_pagefault_alloc_state {
-	XE_PAGEFAULT_ALLOC_STATE_FREE		= 0,
-	XE_PAGEFAULT_ALLOC_STATE_QUEUED		= 1,
-	XE_PAGEFAULT_ALLOC_STATE_CHAINED	= 2,
-	XE_PAGEFAULT_ALLOC_STATE_ACTIVE		= 3,
-	XE_PAGEFAULT_ALLOC_STATE_COUNT		= 4,
-};
-
-static int xe_pagefault_entry_size(void)
-{
-	/*
-	 * Power of two alignment is not a hardware requirement, rather a
-	 * software restriction which makes the math for page fault queue
-	 * management simplier.
-	 */
-	return roundup_pow_of_two(sizeof(struct xe_pagefault));
-}
-
 static int xe_pagefault_begin(struct drm_exec *exec, struct xe_vma *vma,
 			      struct xe_vram_region *vram, bool need_vram_move)
 {
@@ -295,7 +252,6 @@ static int xe_pagefault_service(struct xe_pagefault *pf)
 	return err;
 }
 
-#define XE_PAGEFAULT_CACHE_START_INVALID	U64_MAX
 #define xe_pagefault_cache_start_invalidate(val)	\
 	(val = XE_PAGEFAULT_CACHE_START_INVALID)
 
diff --git a/drivers/gpu/drm/xe/xe_pagefault.h b/drivers/gpu/drm/xe/xe_pagefault.h
index e9c5d1f03760..83b68a19cc7c 100644
--- a/drivers/gpu/drm/xe/xe_pagefault.h
+++ b/drivers/gpu/drm/xe/xe_pagefault.h
@@ -90,4 +90,14 @@ static inline u64 xe_pagefault_start_addr(struct xe_pagefault *pf)
 	return pf->consumer.page_addr;
 }
 
+static inline int xe_pagefault_entry_size(void)
+{
+	/*
+	 * Power of two alignment is not a hardware requirement, rather a
+	 * software restriction which makes the math for page fault queue
+	 * management simplier.
+	 */
+	return roundup_pow_of_two(sizeof(struct xe_pagefault));
+}
+
 #endif
diff --git a/drivers/gpu/drm/xe/xe_pagefault_types.h b/drivers/gpu/drm/xe/xe_pagefault_types.h
index efeba5c3a58b..f99b4e22441c 100644
--- a/drivers/gpu/drm/xe/xe_pagefault_types.h
+++ b/drivers/gpu/drm/xe/xe_pagefault_types.h
@@ -149,6 +149,39 @@ struct xe_pagefault {
 	} producer;
 };
 
+/**
+ * enum xe_pagefault_alloc_state - lifetime state for a page fault queue entry
+ * @XE_PAGEFAULT_ALLOC_STATE_FREE:
+ *	Entry is unused and may be overwritten by the producer, consumer retry
+ *	or requeue..
+ * @XE_PAGEFAULT_ALLOC_STATE_QUEUED:
+ *	Entry has been enqueued and may be dequeued by a worker.
+ * @XE_PAGEFAULT_ALLOC_STATE_ACTIVE:
+ *	Entry has been dequeued and is the worker's currently serviced fault.
+ *	The worker may attach additional faults to it via consumer.next.
+ * @XE_PAGEFAULT_ALLOC_STATE_CHAINED:
+ *	Entry is not independently serviced; it has been chained onto an
+ *	ACTIVE entry via consumer.next and will be acknowledged when the
+ *	leading fault completes.
+ * @XE_PAGEFAULT_ALLOC_STATE_COUNT:
+ *	Maximum enum value.
+ *
+ * The page fault queue provides stable storage for outstanding faults so the
+ * IRQ handler can chain new cache hits directly onto a worker's active fault.
+ * Because entries may remain referenced outside the consumer dequeue window,
+ * the producer must only write into entries in the FREE state.
+ *
+ * State transitions are protected by the page fault queue lock. Workers return
+ * entries to FREE after acknowledging the fault (either as ACTIVE or CHAINED).
+ */
+enum xe_pagefault_alloc_state {
+	XE_PAGEFAULT_ALLOC_STATE_FREE		= 0,
+	XE_PAGEFAULT_ALLOC_STATE_QUEUED		= 1,
+	XE_PAGEFAULT_ALLOC_STATE_CHAINED	= 2,
+	XE_PAGEFAULT_ALLOC_STATE_ACTIVE		= 3,
+	XE_PAGEFAULT_ALLOC_STATE_COUNT		= 4,
+};
+
 /**
  * struct xe_pagefault_queue - Xe pagefault queue (consumer)
  *
@@ -188,6 +221,7 @@ struct xe_pagefault_work {
 	 * Protected by the page fault queue lock.
 	 */
 	struct {
+#define XE_PAGEFAULT_CACHE_START_INVALID	U64_MAX
 		/** @cache.start: Start address of the current page fault */
 		u64 start;
 		/** @cache.end: End address of the current page fault */
-- 
2.53.0