From a027e7d8e4169302e2ac923337d401a5082c6626 Mon Sep 17 00:00:00 2001 From: Young Jin Yoon Date: Thu, 7 Mar 2024 19:22:15 +0000 Subject: [PATCH] build: update i915 prelim headers third_party/uapi/prelim/drm from prelim v2.0-rc24 https://github.com/intel-gpu/drm-uapi-helper Related-To: GSD-5673 Signed-off-by: Young Jin Yoon --- third_party/uapi/prelim/drm/i915_drm.h | 13 +------- third_party/uapi/prelim/drm/i915_drm_prelim.h | 30 ++++++++++++++++++- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/third_party/uapi/prelim/drm/i915_drm.h b/third_party/uapi/prelim/drm/i915_drm.h index af2dad1d9e..f110efe96b 100644 --- a/third_party/uapi/prelim/drm/i915_drm.h +++ b/third_party/uapi/prelim/drm/i915_drm.h @@ -2434,18 +2434,7 @@ struct drm_i915_reset_stats { /* Number of batches lost pending for execution, for this context */ __u32 batch_pending; - __u32 status; -#define I915_RESET_STATS_BANNED (1 << 0) - - struct { - /* Page-aligned virtual address of first reported invalid fault */ - __u64 addr; - __u16 type; - __u16 level; - __u16 access; - __u16 flags; -#define I915_RESET_STATS_FAULT_VALID (1 << 0) - } fault; + __u32 pad; }; /** diff --git a/third_party/uapi/prelim/drm/i915_drm_prelim.h b/third_party/uapi/prelim/drm/i915_drm_prelim.h index b8f8eaae28..084ff3b982 100644 --- a/third_party/uapi/prelim/drm/i915_drm_prelim.h +++ b/third_party/uapi/prelim/drm/i915_drm_prelim.h @@ -254,7 +254,7 @@ struct prelim_i915_user_extension { #define PRELIM_DRM_I915_GEM_VM_GETPARAM DRM_I915_GEM_CONTEXT_GETPARAM #define PRELIM_DRM_I915_GEM_VM_SETPARAM DRM_I915_GEM_CONTEXT_SETPARAM #define PRELIM_DRM_I915_GEM_OBJECT_SETPARAM DRM_I915_GEM_CONTEXT_SETPARAM - +#define PRELIM_DRM_I915_GET_RESET_STATS 0x52 #define PRELIM_DRM_IOCTL_I915_GEM_CREATE_EXT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct prelim_drm_i915_gem_create_ext) #define PRELIM_DRM_IOCTL_I915_GEM_VM_BIND DRM_IOWR(DRM_COMMAND_BASE + PRELIM_DRM_I915_GEM_VM_BIND, struct prelim_drm_i915_gem_vm_bind) @@ -271,6 +271,7 @@ struct prelim_i915_user_extension { #define PRELIM_DRM_IOCTL_I915_GEM_VM_GETPARAM DRM_IOWR(DRM_COMMAND_BASE + PRELIM_DRM_I915_GEM_VM_GETPARAM, struct prelim_drm_i915_gem_vm_param) #define PRELIM_DRM_IOCTL_I915_GEM_VM_SETPARAM DRM_IOWR(DRM_COMMAND_BASE + PRELIM_DRM_I915_GEM_VM_SETPARAM, struct prelim_drm_i915_gem_vm_param) #define PRELIM_DRM_IOCTL_I915_GEM_OBJECT_SETPARAM DRM_IOWR(DRM_COMMAND_BASE + PRELIM_DRM_I915_GEM_OBJECT_SETPARAM, struct prelim_drm_i915_gem_object_param) +#define PRELIM_DRM_IOCTL_I915_GET_RESET_STATS DRM_IOWR(DRM_COMMAND_BASE + PRELIM_DRM_I915_GET_RESET_STATS, struct prelim_drm_i915_reset_stats) /* End PRELIM ioctl's */ @@ -1701,4 +1702,31 @@ struct prelim_drm_i915_gem_vm_param { __u64 value; }; +struct prelim_drm_i915_reset_stats { + __u32 ctx_id; + __u32 flags; + + /* All resets since boot/module reload, for all contexts */ + __u32 reset_count; + + /* Number of batches lost when active in GPU, for this context */ + __u32 batch_active; + + /* Number of batches lost pending for execution, for this context */ + __u32 batch_pending; + + __u32 status; +#define I915_RESET_STATS_BANNED (1 << 0) + + struct { + /* Page-aligned virtual address of first reported invalid fault */ + __u64 addr; + __u16 type; + __u16 level; + __u16 access; + __u16 flags; +#define I915_RESET_STATS_FAULT_VALID (1 << 0) + } fault; +}; + #endif /* __I915_DRM_PRELIM_H__ */