Skip to content

Commit aef21f6

Browse files
committed
tools/include: Sync uapi/drm/i915_drm.h with the kernel sources
To pick up changes from: 0f1bb41 drm/i915: Support replaying GPU hangs with captured context image 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 Please see tools/include/uapi/README for details (it's in the first patch of this series). Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: intel-gfx@lists.freedesktop.org Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent fbc0514 commit aef21f6

1 file changed

Lines changed: 27 additions & 0 deletions

File tree

tools/include/uapi/drm/i915_drm.h

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,6 +2163,15 @@ struct drm_i915_gem_context_param {
21632163
* supports this per context flag.
21642164
*/
21652165
#define I915_CONTEXT_PARAM_LOW_LATENCY 0xe
2166+
2167+
/*
2168+
* I915_CONTEXT_PARAM_CONTEXT_IMAGE:
2169+
*
2170+
* Allows userspace to provide own context images.
2171+
*
2172+
* Note that this is a debug API not available on production kernel builds.
2173+
*/
2174+
#define I915_CONTEXT_PARAM_CONTEXT_IMAGE 0xf
21662175
/* Must be kept compact -- no holes and well documented */
21672176

21682177
/** @value: Context parameter value to be set or queried */
@@ -2564,6 +2573,24 @@ struct i915_context_param_engines {
25642573
struct i915_engine_class_instance engines[N__]; \
25652574
} __attribute__((packed)) name__
25662575

2576+
struct i915_gem_context_param_context_image {
2577+
/** @engine: Engine class & instance to be configured. */
2578+
struct i915_engine_class_instance engine;
2579+
2580+
/** @flags: One of the supported flags or zero. */
2581+
__u32 flags;
2582+
#define I915_CONTEXT_IMAGE_FLAG_ENGINE_INDEX (1u << 0)
2583+
2584+
/** @size: Size of the image blob pointed to by @image. */
2585+
__u32 size;
2586+
2587+
/** @mbz: Must be zero. */
2588+
__u32 mbz;
2589+
2590+
/** @image: Userspace memory containing the context image. */
2591+
__u64 image;
2592+
} __attribute__((packed));
2593+
25672594
/**
25682595
* struct drm_i915_gem_context_create_ext_setparam - Context parameter
25692596
* to set or query during context creation.

0 commit comments

Comments
 (0)