Skip to content

Commit e7ec3a2

Browse files
Yanteng Siacmel
authored andcommitted
tools headers UAPI: Sync the i915_drm.h with the kernel sources
Picking the changes from: 1cc064d ("drm/i915/perf: Add support for OA media units") c61d04c ("drm/i915/perf: Add engine class instance parameters to perf") 02abecd ("drm/i915/uapi: Replace fake flex-array with flexible-array member") Silencing these perf build warnings: 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 Signed-off-by: Yanteng Si <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/4c0c150997ae1455f49094222daa121385643ae0.1683712945.git.siyanteng@loongson.cn Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent e623218 commit e7ec3a2

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

tools/include/uapi/drm/i915_drm.h

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2491,7 +2491,7 @@ struct i915_context_param_engines {
24912491
#define I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE 0 /* see i915_context_engines_load_balance */
24922492
#define I915_CONTEXT_ENGINES_EXT_BOND 1 /* see i915_context_engines_bond */
24932493
#define I915_CONTEXT_ENGINES_EXT_PARALLEL_SUBMIT 2 /* see i915_context_engines_parallel_submit */
2494-
struct i915_engine_class_instance engines[0];
2494+
struct i915_engine_class_instance engines[];
24952495
} __attribute__((packed));
24962496

24972497
#define I915_DEFINE_CONTEXT_PARAM_ENGINES(name__, N__) struct { \
@@ -2676,6 +2676,10 @@ enum drm_i915_oa_format {
26762676
I915_OAR_FORMAT_A32u40_A4u32_B8_C8,
26772677
I915_OA_FORMAT_A24u40_A14u32_B8_C8,
26782678

2679+
/* MTL OAM */
2680+
I915_OAM_FORMAT_MPEC8u64_B8_C8,
2681+
I915_OAM_FORMAT_MPEC8u32_B8_C8,
2682+
26792683
I915_OA_FORMAT_MAX /* non-ABI */
26802684
};
26812685

@@ -2758,6 +2762,25 @@ enum drm_i915_perf_property_id {
27582762
*/
27592763
DRM_I915_PERF_PROP_POLL_OA_PERIOD,
27602764

2765+
/**
2766+
* Multiple engines may be mapped to the same OA unit. The OA unit is
2767+
* identified by class:instance of any engine mapped to it.
2768+
*
2769+
* This parameter specifies the engine class and must be passed along
2770+
* with DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE.
2771+
*
2772+
* This property is available in perf revision 6.
2773+
*/
2774+
DRM_I915_PERF_PROP_OA_ENGINE_CLASS,
2775+
2776+
/**
2777+
* This parameter specifies the engine instance and must be passed along
2778+
* with DRM_I915_PERF_PROP_OA_ENGINE_CLASS.
2779+
*
2780+
* This property is available in perf revision 6.
2781+
*/
2782+
DRM_I915_PERF_PROP_OA_ENGINE_INSTANCE,
2783+
27612784
DRM_I915_PERF_PROP_MAX /* non-ABI */
27622785
};
27632786

0 commit comments

Comments
 (0)