Quoting Arnaldo Carvalho de Melo (2019-01-04 20:33:28) > From: Arnaldo Carvalho de Melo <[email protected]> > > To get the changes in these csets: > > fe841686470d Revert "drm/i915/perf: add a parameter to control the size of > OA buffer" > cd956bfcd0f5 drm/i915/perf: add a parameter to control the size of OA buffer > 4bdafb9ddfa4 drm/i915: Remove i915.enable_ppgtt override > > Not one of them result in any changes in tools/perf/, this is just to > silence 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: Adrian Hunter <[email protected]> > Cc: Chris Wilson <[email protected]> > Cc: Jiri Olsa <[email protected]> > Cc: Joonas Lahtinen <[email protected]> > Cc: Lionel Landwerlin <[email protected]> > Cc: Namhyung Kim <[email protected]> > Link: https://lkml.kernel.org/n/[email protected] > Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
This is: Acked-by: Joonas Lahtinen <[email protected]> I assume this'll be merged through tip tree along the other changes. Regards, Joonas > --- > tools/include/uapi/drm/i915_drm.h | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tools/include/uapi/drm/i915_drm.h > b/tools/include/uapi/drm/i915_drm.h > index a4446f452040..298b2e197744 100644 > --- a/tools/include/uapi/drm/i915_drm.h > +++ b/tools/include/uapi/drm/i915_drm.h > @@ -412,6 +412,14 @@ typedef struct drm_i915_irq_wait { > int irq_seq; > } drm_i915_irq_wait_t; > > +/* > + * Different modes of per-process Graphics Translation Table, > + * see I915_PARAM_HAS_ALIASING_PPGTT > + */ > +#define I915_GEM_PPGTT_NONE 0 > +#define I915_GEM_PPGTT_ALIASING 1 > +#define I915_GEM_PPGTT_FULL 2 > + > /* Ioctl to query kernel params: > */ > #define I915_PARAM_IRQ_ACTIVE 1 > -- > 2.20.1 >
