OSDN Git Service

tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 3 May 2021 14:51:17 +0000 (11:51 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 5 Jul 2021 17:25:35 +0000 (14:25 -0300)
commit4a1cddeab501f6a9a248bef783bc48e8a91c098e
tree00b2df16cb9ddadd1bd6352dd2edcc9ee9f56ee5
parent688ef3e3061df3747e4d761ef71abe7371cf0e84
tools headers UAPI: Sync drm/i915_drm.h with the kernel sources

To pick the changes in:

  2459e56fd8af0b47 ("drm/i915/uapi: implement object placement extension")
  ebcb40298947bdb0 ("drm/i915/uapi: introduce drm_i915_gem_create_ext")
  710217292a61110a ("drm/i915/query: Expose memory regions through the query uAPI")
  e3bdccafb5bcfab2 ("drm/i915/uapi: convert i915_query and friend to kernel doc")
  19d053d477a14506 ("drm/i915/uapi: convert i915_user_extension to kernel doc")
  2ef6a01fb636997b ("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>
tools/include/uapi/drm/i915_drm.h