tools headers uapi: Update drm/i915_drm.h
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 82392516e9e0818cd2227cf9a16205c90a6cacfa Gitweb: https://git.kernel.org/tip/82392516e9e0818cd2227cf9a16205c90a6cacfa Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 25 Mar 2019 14:28:20 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 28 Mar 2019 14:31:56 -0300
tools headers uapi: Update drm/i915_drm.h
To get the changes in:
e46c2e99f600 ("drm/i915: Expose RPCS (SSEU) configuration to userspace (Gen11 only)")
That don't cause changes in the generated perf binaries.
To silence this perf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/drm/i915_drm.h' differs from latest version at 'include/uapi/drm/i915_drm.h' diff -u tools/include/uapi/drm/i915_drm.h include/uapi/drm/i915_drm.h
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/include/uapi/drm/i915_drm.h | 64 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)
tools/include/uapi/drm/i915_drm.h +64 -0
@@ -1486,9 +1486,73 @@ struct drm_i915_gem_context_param {#define I915_CONTEXT_MAX_USER_PRIORITY 1023/* inclusive */ #define I915_CONTEXT_DEFAULT_PRIORITY 0#define I915_CONTEXT_MIN_USER_PRIORITY -1023/* inclusive */ +/* +* When using the following param, value should be a pointer to +* drm_i915_gem_context_param_sseu. +*/ +#define I915_CONTEXT_PARAM_SSEU 0x7__u64 value; }; +/** +* Context SSEU programming +* +* It may be necessary for either functional or performance reason to configure +* a context to run with a reduced number of SSEU (where SSEU stands for Slice/ +* Sub-slice/EU). +* +* This is done by configuring SSEU configuration using the below +* @struct drm_i915_gem_context_param_sseu for every supported engine which +* userspace intends to use. +* +* Not all GPUs or engines support this functionality in which case an error +* code -ENODEV will be returned. +* +* Also, flexibility of possible SSEU configuration permutations varies between +* GPU generations and software imposed limitations. Requesting such a +* combination will return an error code of -EINVAL. +* +* NOTE: When perf/OA is active the context's SSEU configuration is ignored in +* favour of a single global setting. +*/ +struct drm_i915_gem_context_param_sseu { +/* +* Engine class & instance to be configured or queried. +*/ +__u16 engine_class; +__u16 engine_instance; + +/* +* Unused for now. Must be cleared to zero. +*/ +__u32 flags; + +/* +* Mask of slices to enable for the context. Valid values are a subset +* of the bitmask value returned for I915_PARAM_SLICE_MASK. +*/ +__u64 slice_mask; + +/* +* Mask of subslices to enable for the context. Valid values are a +* subset of the bitmask value return by I915_PARAM_SUBSLICE_MASK. +*/ +__u64 subslice_mask; + +/* +* Minimum/Maximum number of EUs to enable per subslice for the +* context. min_eus_per_subslice must be inferior or equal to +* max_eus_per_subslice. +*/ +__u16 min_eus_per_subslice; +__u16 max_eus_per_subslice; + +/* +* Unused for now. Must be cleared to zero. +*/ +__u32 rsvd; +}; +enum drm_i915_oa_format {I915_OA_FORMAT_A13 =1 ,/* HSW only */ I915_OA_FORMAT_A29 ,/* HSW only */