Skip to content
  • Arnaldo Carvalho de Melo's avatar
    tools headers uapi: Synchronize i915_drm.h · 01f97511
    Arnaldo Carvalho de Melo authored
    To pick up the changes in:
    
      c822e059 drm/i915: expose rcs topology through query uAPI
      a446ae2c drm/i915: add query uAPI
    
    This affects 'perf trace', that automagically gets the definition of the
    new I915_QUERY DRM ioctl:
    
      --- /tmp/build/perf/trace/beauty/generated/ioctl/drm_ioctl_array.c.old 2018-04-05 14:38:33.660111995 -0300
      +++ /tmp/build/perf/trace/beauty/generated/ioctl/drm_ioctl_array.c 2018-04-05 14:40:17.923283914 -0300
      @@ -158,4 +158,5 @@
              [DRM_COMMAND_BASE + 0x36] = "I915_PERF_OPEN",
              [DRM_COMMAND_BASE + 0x37] = "I915_PERF_ADD_CONFIG",
              [DRM_COMMAND_BASE + 0x38] = "I915_PERF_REMOVE_CONFIG",
      +       [DRM_COMMAND_BASE + 0x39] = "I915_QUERY",
       };
    
    I.e. on systems where this is used it will appear when, for instance,
    one does a system wide 'perf trace' session looking for ioctl calls,
    just like it does with the previously implemented DRM_I915 ioctls:
    
      # perf trace -e ioctl --filter-pids 2190
    <SNIP>
      4346.232 ( 0.012 ms): gnome-shell/1455 ioctl(fd: 8</dev/dri/card0>, cmd: DRM_I915_GEM_BUSY, arg: 0x7fff3b0cd910) = 0
      4346.246 ( 0.002 ms): gnome-shell/1455 ioctl(fd: 8</dev/dri/card0>, cmd: DRM_I915_GEM_MADVISE, arg: 0x7fff3b0cd980) = 0
      4346.252 ( 0.002 ms): gnome-shell/1455 ioctl(fd: 8</dev/dri/card0>, cmd: DRM_I915_GEM_BUSY, arg: 0x7fff3b0cdb00) = 0
    <SNIP>
    
    This silences this perf tools 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'
    
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
    Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
    Cc: Wang Nan <wangnan0@huawei.com>
    Link: https://lkml.kernel.org/n/tip-5kxuvruuzdbojvf90f8j2wat@git.kernel.org
    
    
    Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    01f97511