include/drm-uapi: bump headers

[mesa.git] / include / drm-uapi / i915_drm.h

diff --git a/include/drm-uapi/i915_drm.h b/include/drm-uapi/i915_drm.h
index 2b55af13a1fc24efe5d57db66c590538b5937119..ef696d1a5435f6e3b51fe017fa022f5b1b760f19 100644 (file)
--- a/include/drm-uapi/i915_drm.h
+++ b/include/drm-uapi/i915_drm.h
@@ -55,7 +55,7 @@ extern "C" {
  *     cause the related events to not be seen.
  *
  * I915_RESET_UEVENT - Event is generated just before an attempt to reset the
  *     cause the related events to not be seen.
  *
  * I915_RESET_UEVENT - Event is generated just before an attempt to reset the

- *     the GPU. The value supplied with the event is always 1. NOTE: Disable
+ *     GPU. The value supplied with the event is always 1. NOTE: Disable

  *     reset via module parameter will cause this event to not be seen.
  */
 #define I915_L3_PARITY_UEVENT          "L3_PARITY_ERROR"
  *     reset via module parameter will cause this event to not be seen.
  */
 #define I915_L3_PARITY_UEVENT          "L3_PARITY_ERROR"


@@ -619,6 +619,12 @@ typedef struct drm_i915_irq_wait {
  */
 #define I915_PARAM_PERF_REVISION       54
 
  */
 #define I915_PARAM_PERF_REVISION       54
 

+/* Query whether DRM_I915_GEM_EXECBUFFER2 supports supplying an array of
+ * timeline syncobj through drm_i915_gem_execbuffer_ext_timeline_fences. See
+ * I915_EXEC_USE_EXTENSIONS.
+ */
+#define I915_PARAM_HAS_EXEC_TIMELINE_FENCES 55
+

 /* Must be kept compact -- no holes and well documented */
 
 typedef struct drm_i915_getparam {
 /* Must be kept compact -- no holes and well documented */
 
 typedef struct drm_i915_getparam {


@@ -1046,6 +1052,38 @@ struct drm_i915_gem_exec_fence {
        __u32 flags;
 };
 
        __u32 flags;
 };
 

+/**
+ * See drm_i915_gem_execbuffer_ext_timeline_fences.
+ */
+#define DRM_I915_GEM_EXECBUFFER_EXT_TIMELINE_FENCES 0
+
+/**
+ * This structure describes an array of drm_syncobj and associated points for
+ * timeline variants of drm_syncobj. It is invalid to append this structure to
+ * the execbuf if I915_EXEC_FENCE_ARRAY is set.
+ */
+struct drm_i915_gem_execbuffer_ext_timeline_fences {
+       struct i915_user_extension base;
+
+       /**
+        * Number of element in the handles_ptr & value_ptr arrays.
+        */
+       __u64 fence_count;
+
+       /**
+        * Pointer to an array of struct drm_i915_gem_exec_fence of length
+        * fence_count.
+        */
+       __u64 handles_ptr;
+
+       /**
+        * Pointer to an array of u64 values of length fence_count. Values
+        * must be 0 for a binary drm_syncobj. A Value of 0 for a timeline
+        * drm_syncobj is invalid as it turns a drm_syncobj into a binary one.
+        */
+       __u64 values_ptr;
+};
+

 struct drm_i915_gem_execbuffer2 {
        /**
         * List of gem_exec_object2 structs
 struct drm_i915_gem_execbuffer2 {
        /**
         * List of gem_exec_object2 structs


@@ -1062,8 +1100,14 @@ struct drm_i915_gem_execbuffer2 {
        __u32 num_cliprects;
        /**
         * This is a struct drm_clip_rect *cliprects if I915_EXEC_FENCE_ARRAY
        __u32 num_cliprects;
        /**
         * This is a struct drm_clip_rect *cliprects if I915_EXEC_FENCE_ARRAY

-        * is not set.  If I915_EXEC_FENCE_ARRAY is set, then this is a
-        * struct drm_i915_gem_exec_fence *fences.
+        * & I915_EXEC_USE_EXTENSIONS are not set.
+        *
+        * If I915_EXEC_FENCE_ARRAY is set, then this is a pointer to an array
+        * of struct drm_i915_gem_exec_fence and num_cliprects is the length
+        * of the array.
+        *
+        * If I915_EXEC_USE_EXTENSIONS is set, then this is a pointer to a
+        * single struct i915_user_extension and num_cliprects is 0.

         */
        __u64 cliprects_ptr;
 #define I915_EXEC_RING_MASK              (0x3f)
         */
        __u64 cliprects_ptr;
 #define I915_EXEC_RING_MASK              (0x3f)


@@ -1181,7 +1225,16 @@ struct drm_i915_gem_execbuffer2 {
  */
 #define I915_EXEC_FENCE_SUBMIT         (1 << 20)
 
  */
 #define I915_EXEC_FENCE_SUBMIT         (1 << 20)
 

-#define __I915_EXEC_UNKNOWN_FLAGS (-(I915_EXEC_FENCE_SUBMIT << 1))
+/*
+ * Setting I915_EXEC_USE_EXTENSIONS implies that
+ * drm_i915_gem_execbuffer2.cliprects_ptr is treated as a pointer to an linked
+ * list of i915_user_extension. Each i915_user_extension node is the base of a
+ * larger structure. The list of supported structures are listed in the
+ * drm_i915_gem_execbuffer_ext enum.
+ */
+#define I915_EXEC_USE_EXTENSIONS       (1 << 21)
+
+#define __I915_EXEC_UNKNOWN_FLAGS (-(I915_EXEC_USE_EXTENSIONS << 1))

 
 #define I915_EXEC_CONTEXT_ID_MASK      (0xffffffff)
 #define i915_execbuffer2_set_context_id(eb2, context) \
 
 #define I915_EXEC_CONTEXT_ID_MASK      (0xffffffff)
 #define i915_execbuffer2_set_context_id(eb2, context) \


@@ -1934,7 +1987,7 @@ enum drm_i915_perf_property_id {
 
        /**
         * The value specifies which set of OA unit metrics should be
 
        /**
         * The value specifies which set of OA unit metrics should be

-        * be configured, defining the contents of any OA unit reports.
+        * configured, defining the contents of any OA unit reports.

         *
         * This property is available in perf revision 1.
         */
         *
         * This property is available in perf revision 1.
         */