On one hand the WAIT_OP represents the operation use for waiting such as ==, !=, > and so on. On the other hand, the mask is applied to the value used for comparision. Split those two to bring clarity to the uapi.
Showing the changes to include/uapi (1 of 2 files). Show all
Unified · Split
| @@ -915,12 +915,12 @@ struct drm_xe_wait_user_fence { · 914 unmodified lines | |||
| 915 | */ | 915 | */ |
| 916 | __u64 addr; | 916 | __u64 addr; |
| 917 | 917 | ||
| 918 | #define DRM_XE_UFENCE_WAIT_EQ 0 | 918 | #define DRM_XE_UFENCE_WAIT_OP_EQ 0x0 |
| 919 | #define DRM_XE_UFENCE_WAIT_NEQ 1 | 919 | #define DRM_XE_UFENCE_WAIT_OP_NEQ 0x1 |
| 920 | #define DRM_XE_UFENCE_WAIT_GT 2 | 920 | #define DRM_XE_UFENCE_WAIT_OP_GT 0x2 |
| 921 | #define DRM_XE_UFENCE_WAIT_GTE 3 | 921 | #define DRM_XE_UFENCE_WAIT_OP_GTE 0x3 |
| 922 | #define DRM_XE_UFENCE_WAIT_LT 4 | 922 | #define DRM_XE_UFENCE_WAIT_OP_LT 0x4 |
| 923 | #define DRM_XE_UFENCE_WAIT_LTE 5 | 923 | #define DRM_XE_UFENCE_WAIT_OP_LTE 0x5 |
| 924 | /** @op: wait operation (type of comparison) */ | 924 | /** @op: wait operation (type of comparison) */ |
| 925 | __u16 op; | 925 | __u16 op; |
| 926 | 926 | ||
| @@ -935,12 +935,13 @@ struct drm_xe_wait_user_fence { · 8 unmodified lines | |||
| 935 | /** @value: compare value */ | 935 | /** @value: compare value */ |
| 936 | __u64 value; | 936 | __u64 value; |
| 937 | 937 | ||
| 938 | #define DRM_XE_UFENCE_WAIT_U8 0xffu | 938 | #define DRM_XE_UFENCE_WAIT_MASK_U8 0xffu |
| 939 | #define DRM_XE_UFENCE_WAIT_U16 0xffffu | 939 | #define DRM_XE_UFENCE_WAIT_MASK_U16 0xffffu |
| 940 | #define DRM_XE_UFENCE_WAIT_U32 0xffffffffu | 940 | #define DRM_XE_UFENCE_WAIT_MASK_U32 0xffffffffu |
| 941 | #define DRM_XE_UFENCE_WAIT_U64 0xffffffffffffffffu | 941 | #define DRM_XE_UFENCE_WAIT_MASK_U64 0xffffffffffffffffu |
| 942 | /** @mask: comparison mask */ | 942 | /** @mask: comparison mask */ |
| 943 | __u64 mask; | 943 | __u64 mask; |
| 944 | |||
| 944 | /** | 945 | /** |
| 945 | * @timeout: how long to wait before bailing, value in nanoseconds. | 946 | * @timeout: how long to wait before bailing, value in nanoseconds. |
| 946 | * Without DRM_XE_UFENCE_WAIT_FLAG_ABSTIME flag set (relative timeout) | 947 | * Without DRM_XE_UFENCE_WAIT_FLAG_ABSTIME flag set (relative timeout) |