-
Arnaldo Carvalho de Melo authored
To pick up the changes from: d1172ab3 ("drm/i915: Introduce struct class_instance for engines across the uAPI") 96fd2c66 ("drm/i915: Drop new chunks of context creation ABI (for now)") ea593dbb ("drm/i915: Allow contexts to share a single timeline across all engines") b9171541 ("drm/i915: Extend CONTEXT_CREATE to set parameters upon construction") e0695db7 ("drm/i915: Create/destroy VM (ppGTT) for use with contexts") 9d1305ef ("drm/i915: Introduce the i915_user_extension_method") c8b50242 ("drm/i915: Remove last traces of exec-id (GEM_BUSY)") d90c06d5 ("drm/i915: Fix I915_EXEC_RING_MASK") e8861964 ("drm/i915: Use HW semaphores for inter-engine synchronisation on gen8+") be03564b ("drm/i915: Include reminders about leaving no holes in uAPI enums") ba4fda62 ("drm/i915: Optionally disable automatic recovery after a GPU reset") We still don't take into account the _IOC_SIZE() to differentiate ioctl cmds, so more work is needed to support the extension mechanism that is being used here so that we can differentiate DRM_IOCTL_I915_GEM_CONTEXT_CREATE from the newly introduced DRM_IOCTL_I915_GEM_CONTEXT_CREATE_EXT cmd. This 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: Adrian Hunter <adrian.hunter@intel.com> Cc: Brendan Gregg <brendan.d.gregg@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Chris Wilson <chris@chris-wilson.co.uk> Link: https://lkml.kernel.org/n/tip-csn0vanmc7pevyka5qcg0xyw@git.kernel.orgSigned-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
e6aff9f8