Commit c2446944 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync drm/i915_drm.h with the kernel sources 



To pick the changes in:

  8c3b1ba0 ("drm/i915/gt: Track the overall awake/busy time")
  348fb0cb ("drm/i915/pmu: Deprecate I915_PMU_LAST and optimize state tracking")

That don't result in any change in tooling:

  $ 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
  $

Only silences 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: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3ae0415d

tools/include/uapi/drm/i915_drm.h

+2 −1
Original line number Diff line number Diff line
@@ -177,8 +177,9 @@ enum drm_i915_pmu_engine_sample { 
#define I915_PMU_REQUESTED_FREQUENCY	__I915_PMU_OTHER(1)

#define I915_PMU_INTERRUPTS		__I915_PMU_OTHER(2)

#define I915_PMU_RC6_RESIDENCY		__I915_PMU_OTHER(3)

#define I915_PMU_SOFTWARE_GT_AWAKE_TIME	__I915_PMU_OTHER(4)



#define I915_PMU_LAST I915_PMU_RC6_RESIDENCY

#define I915_PMU_LAST /* Deprecated - do not use */ I915_PMU_RC6_RESIDENCY



/* Each region is a minimum of 16k, and there are at most 255 of them.

 */