Skip to content

Commit

Permalink
tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
Browse files Browse the repository at this point in the history
To pick the changes in:

  2459e56 ("drm/i915/uapi: implement object placement extension")
  ebcb402 ("drm/i915/uapi: introduce drm_i915_gem_create_ext")
  7102172 ("drm/i915/query: Expose memory regions through the query uAPI")
  e3bdcca ("drm/i915/uapi: convert i915_query and friend to kernel doc")
  19d053d ("drm/i915/uapi: convert i915_user_extension to kernel doc")
  2ef6a01 ("drm/i915/uapi: fix kernel doc warnings")

That picks a new ioctl:

  $ 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	2021-07-05 14:25:13.247680316 -0300
  +++ after	2021-07-05 14:25:22.454874111 -0300
  @@ -166,4 +166,5 @@
   	[DRM_COMMAND_BASE + 0x39] = "I915_QUERY",
   	[DRM_COMMAND_BASE + 0x3a] = "I915_GEM_VM_CREATE",
   	[DRM_COMMAND_BASE + 0x3b] = "I915_GEM_VM_DESTROY",
  +	[DRM_COMMAND_BASE + 0x3c] = "I915_GEM_CREATE_EXT",
   };
  $

Addressing this perf build warning:

  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

Cc: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Jul 5, 2021
1 parent 688ef3e commit 4a1cdde
Showing 1 changed file with 359 additions and 34 deletions.
Loading

0 comments on commit 4a1cdde

Please sign in to comment.