Skip to content

Commit 3ef842a

Browse files
committed
tools/include: Sync uapi/drm/i915_drm.h with the kernel sources
To pick up changes from: b112364 ("drm/i915: Add GuC submission interface version query") 5cf0fbf ("drm/i915: Add some boring kerneldoc") This should be used to beautify DRM syscall arguments and it addresses these tools/perf build warnings: Warning: Kernel ABI header differences: diff -u tools/include/uapi/drm/i915_drm.h include/uapi/drm/i915_drm.h Cc: Maarten Lankhorst <[email protected]> Cc: Maxime Ripard <[email protected]> Cc: Thomas Zimmermann <[email protected]> Cc: David Airlie <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: [email protected] Signed-off-by: Namhyung Kim <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f340858 commit 3ef842a

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

tools/include/uapi/drm/i915_drm.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3013,6 +3013,7 @@ struct drm_i915_query_item {
30133013
* - %DRM_I915_QUERY_MEMORY_REGIONS (see struct drm_i915_query_memory_regions)
30143014
* - %DRM_I915_QUERY_HWCONFIG_BLOB (see `GuC HWCONFIG blob uAPI`)
30153015
* - %DRM_I915_QUERY_GEOMETRY_SUBSLICES (see struct drm_i915_query_topology_info)
3016+
* - %DRM_I915_QUERY_GUC_SUBMISSION_VERSION (see struct drm_i915_query_guc_submission_version)
30163017
*/
30173018
__u64 query_id;
30183019
#define DRM_I915_QUERY_TOPOLOGY_INFO 1
@@ -3021,6 +3022,7 @@ struct drm_i915_query_item {
30213022
#define DRM_I915_QUERY_MEMORY_REGIONS 4
30223023
#define DRM_I915_QUERY_HWCONFIG_BLOB 5
30233024
#define DRM_I915_QUERY_GEOMETRY_SUBSLICES 6
3025+
#define DRM_I915_QUERY_GUC_SUBMISSION_VERSION 7
30243026
/* Must be kept compact -- no holes and well documented */
30253027

30263028
/**
@@ -3566,6 +3568,20 @@ struct drm_i915_query_memory_regions {
35663568
struct drm_i915_memory_region_info regions[];
35673569
};
35683570

3571+
/**
3572+
* struct drm_i915_query_guc_submission_version - query GuC submission interface version
3573+
*/
3574+
struct drm_i915_query_guc_submission_version {
3575+
/** @branch: Firmware branch version. */
3576+
__u32 branch;
3577+
/** @major: Firmware major version. */
3578+
__u32 major;
3579+
/** @minor: Firmware minor version. */
3580+
__u32 minor;
3581+
/** @patch: Firmware patch version. */
3582+
__u32 patch;
3583+
};
3584+
35693585
/**
35703586
* DOC: GuC HWCONFIG blob uAPI
35713587
*

0 commit comments

Comments
 (0)