mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 22:37:45 -04:00
Arnaldo Carvalho de Melo
95dc663aa6
Picking the changes from:c5d3e39caa("drm/i915: Engine discovery query")a88b6e4cba("drm/i915: Allow specification of parallel execbuf")ee1136908e("drm/i915/execlists: Virtual engine bonding")6d06779e86("drm/i915: Load balancing across a virtual engine")b81dde7194("drm/i915: Allow userspace to clone contexts on creation")8319f44c05("drm/i915: Re-expose SINGLE_TIMELINE flags for context creation")e620f7b3a2("drm/i915: Extend I915_CONTEXT_PARAM_SSEU to support local ctx->engine[]")976b55f0e1("drm/i915: Allow a context to define its set of engines")7f3f317a66("drm/i915: Restore control over ppgtt for context creation ABI")75b3f1cb50("drm: Fix drm.h uapi header for GNU/kFreeBSD") Silencing these perf build warnings: Warning: Kernel ABI header at 'tools/include/uapi/drm/drm.h' differs from latest version at 'include/uapi/drm/drm.h' diff -u tools/include/uapi/drm/drm.h include/uapi/drm/drm.h 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 Now 'perf trace' and other code that might use the tools/perf/trace/beauty autogenerated tables will be able to translate this new ioctl code into a string: $ tools/perf/trace/beauty/drm_ioctl.sh > before $ cp include/uapi/drm/i915_drm.h tools/include/uapi/drm/i915_drm.h $ tools/perf/trace/beauty/drm_ioctl.sh > after $ diff -u before after --- before 2019-07-26 13:02:22.052723640 -0300 +++ after 2019-07-26 13:02:35.354906036 -0300 @@ -163,4 +163,6 @@ [DRM_COMMAND_BASE + 0x37] = "I915_PERF_ADD_CONFIG", [DRM_COMMAND_BASE + 0x38] = "I915_PERF_REMOVE_CONFIG", [DRM_COMMAND_BASE + 0x39] = "I915_QUERY", + [DRM_COMMAND_BASE + 0x3a] = "I915_GEM_VM_CREATE", + [DRM_COMMAND_BASE + 0x3b] = "I915_GEM_VM_DESTROY", }; $ Cc: Adrian Hunter <[email protected]> Cc: Chris Wilson <[email protected]> Cc: Eric Anholt <[email protected]> Cc: James Clarke <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Luis Cláudio Gonçalves <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Link: https://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>