Move access_type and pagefault struct to header file so it
can be shared with svm sub-system. This is preparation work
for enabling page fault for svm.

Signed-off-by: Oak Zeng <oak.z...@intel.com>
Cc: Niranjana Vishwanathapura <niranjana.vishwanathap...@intel.com>
Cc: Matthew Brost <matthew.br...@intel.com>
Cc: Thomas Hellström <thomas.hellst...@intel.com>
Cc: Brian Welty <brian.we...@intel.com>
---
 drivers/gpu/drm/xe/xe_gt.h           | 20 ++++++++++++++++++++
 drivers/gpu/drm/xe/xe_gt_pagefault.c | 21 ---------------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h
index 4486e083f5ef..51dd288cf1cf 100644
--- a/drivers/gpu/drm/xe/xe_gt.h
+++ b/drivers/gpu/drm/xe/xe_gt.h
@@ -17,6 +17,26 @@
                          xe_hw_engine_is_valid((hwe__)))
 
 #define CCS_MASK(gt) (((gt)->info.engine_mask & XE_HW_ENGINE_CCS_MASK) >> 
XE_HW_ENGINE_CCS0)
+enum access_type {
+       ACCESS_TYPE_READ = 0,
+       ACCESS_TYPE_WRITE = 1,
+       ACCESS_TYPE_ATOMIC = 2,
+       ACCESS_TYPE_RESERVED = 3,
+};
+
+struct pagefault {
+       u64 page_addr;
+       u32 asid;
+       u16 pdata;
+       u8 vfid;
+       u8 access_type;
+       u8 fault_type;
+       u8 fault_level;
+       u8 engine_class;
+       u8 engine_instance;
+       u8 fault_unsuccessful;
+       bool trva_fault;
+};
 
 #ifdef CONFIG_FAULT_INJECTION
 #include <linux/fault-inject.h> /* XXX: fault-inject.h is broken */
diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c 
b/drivers/gpu/drm/xe/xe_gt_pagefault.c
index 5c2603075af9..467d68f8332e 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
@@ -23,27 +23,6 @@
 #include "xe_trace.h"
 #include "xe_vm.h"
 
-struct pagefault {
-       u64 page_addr;
-       u32 asid;
-       u16 pdata;
-       u8 vfid;
-       u8 access_type;
-       u8 fault_type;
-       u8 fault_level;
-       u8 engine_class;
-       u8 engine_instance;
-       u8 fault_unsuccessful;
-       bool trva_fault;
-};
-
-enum access_type {
-       ACCESS_TYPE_READ = 0,
-       ACCESS_TYPE_WRITE = 1,
-       ACCESS_TYPE_ATOMIC = 2,
-       ACCESS_TYPE_RESERVED = 3,
-};
-
 enum fault_type {
        NOT_PRESENT = 0,
        WRITE_ACCESS_VIOLATION = 1,
-- 
2.26.3

Reply via email to