tools headers UAPI: Update tools's copy of drm.h headers
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 14 Apr 2020 12:29:03 +0000 (09:29 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 14 Apr 2020 14:02:52 +0000 (11:02 -0300)
Picking the changes from:

  455e00f1412f ("drm: Add getfb2 ioctl")

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

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/drm.h tools/include/uapi/drm/drm.h
  $ tools/perf/trace/beauty/drm_ioctl.sh > after
  $ diff -u before after
  --- before 2020-04-14 09:28:45.461821077 -0300
  +++ after 2020-04-14 09:28:53.594782685 -0300
  @@ -107,6 +107,7 @@
    [0xCB] = "SYNCOBJ_QUERY",
    [0xCC] = "SYNCOBJ_TRANSFER",
    [0xCD] = "SYNCOBJ_TIMELINE_SIGNAL",
  + [0xCE] = "MODE_GETFB2",
    [DRM_COMMAND_BASE + 0x00] = "I915_INIT",
    [DRM_COMMAND_BASE + 0x01] = "I915_FLUSH",
    [DRM_COMMAND_BASE + 0x02] = "I915_FLIP",
  $

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/include/uapi/drm/drm.h

index 868bf7996c0f8920e589b58b192528c5a602a9fe..808b48a93330bad83759a3cd81331f812296a12a 100644 (file)
@@ -948,6 +948,8 @@ extern "C" {
 #define DRM_IOCTL_SYNCOBJ_TRANSFER     DRM_IOWR(0xCC, struct drm_syncobj_transfer)
 #define DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL      DRM_IOWR(0xCD, struct drm_syncobj_timeline_array)
 
+#define DRM_IOCTL_MODE_GETFB2          DRM_IOWR(0xCE, struct drm_mode_fb_cmd2)
+
 /**
  * Device specific ioctls should only be in their respective headers
  * The device specific ioctl range is from 0x40 to 0x9f.