To pick up changes from: b112364867499 ("drm/i915: Add GuC submission interface version query") 5cf0fbf763741 ("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
Unified · Split
| @@ -3013,6 +3013,7 @@ struct drm_i915_query_item { · 3012 unmodified lines | ||
| 3013 | 3013 | * - %DRM_I915_QUERY_MEMORY_REGIONS (see struct drm_i915_query_memory_regions) |
| 3014 | 3014 | * - %DRM_I915_QUERY_HWCONFIG_BLOB (see `GuC HWCONFIG blob uAPI`) |
| 3015 | 3015 | * - %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) | |
| 3016 | 3017 | */ |
| 3017 | 3018 | __u64 query_id; |
| 3018 | 3019 | #define DRM_I915_QUERY_TOPOLOGY_INFO 1 |
| @@ -3021,6 +3022,7 @@ struct drm_i915_query_item { · 2 unmodified lines | ||
| 3021 | 3022 | #define DRM_I915_QUERY_MEMORY_REGIONS 4 |
| 3022 | 3023 | #define DRM_I915_QUERY_HWCONFIG_BLOB 5 |
| 3023 | 3024 | #define DRM_I915_QUERY_GEOMETRY_SUBSLICES 6 |
| 3025 | +#define DRM_I915_QUERY_GUC_SUBMISSION_VERSION 7 | |
| 3024 | 3026 | /* Must be kept compact -- no holes and well documented */ |
| 3025 | 3027 | |
| 3026 | 3028 | /** |
| @@ -3566,6 +3568,20 @@ struct drm_i915_query_memory_regions { · 539 unmodified lines | ||
| 3566 | 3568 | struct drm_i915_memory_region_info regions[]; |
| 3567 | 3569 | }; |
| 3568 | 3570 | |
| 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 | + | |
| 3569 | 3585 | /** |
| 3570 | 3586 | * DOC: GuC HWCONFIG blob uAPI |
| 3571 | 3587 | * |