Skip to content

Commit 365f9cc

Browse files
committed
tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
To pick the change in: cc66212 ("drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET") That don't result in any changes in tooling, just 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: Abdiel Janulgue <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Chris Wilson <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent f65b9db commit 365f9cc

File tree

1 file changed

+32
-0
lines changed

1 file changed

+32
-0
lines changed

tools/include/uapi/drm/i915_drm.h

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ typedef struct _drm_i915_sarea {
395395
#define DRM_IOCTL_I915_GEM_PWRITE DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite)
396396
#define DRM_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap)
397397
#define DRM_IOCTL_I915_GEM_MMAP_GTT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_gtt)
398+
#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_offset)
398399
#define DRM_IOCTL_I915_GEM_SET_DOMAIN DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SET_DOMAIN, struct drm_i915_gem_set_domain)
399400
#define DRM_IOCTL_I915_GEM_SW_FINISH DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)
400401
#define DRM_IOCTL_I915_GEM_SET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
@@ -793,6 +794,37 @@ struct drm_i915_gem_mmap_gtt {
793794
__u64 offset;
794795
};
795796

797+
struct drm_i915_gem_mmap_offset {
798+
/** Handle for the object being mapped. */
799+
__u32 handle;
800+
__u32 pad;
801+
/**
802+
* Fake offset to use for subsequent mmap call
803+
*
804+
* This is a fixed-size type for 32/64 compatibility.
805+
*/
806+
__u64 offset;
807+
808+
/**
809+
* Flags for extended behaviour.
810+
*
811+
* It is mandatory that one of the MMAP_OFFSET types
812+
* (GTT, WC, WB, UC, etc) should be included.
813+
*/
814+
__u64 flags;
815+
#define I915_MMAP_OFFSET_GTT 0
816+
#define I915_MMAP_OFFSET_WC 1
817+
#define I915_MMAP_OFFSET_WB 2
818+
#define I915_MMAP_OFFSET_UC 3
819+
820+
/*
821+
* Zero-terminated chain of extensions.
822+
*
823+
* No current extensions defined; mbz.
824+
*/
825+
__u64 extensions;
826+
};
827+
796828
struct drm_i915_gem_set_domain {
797829
/** Handle for the object */
798830
__u32 handle;

0 commit comments

Comments
 (0)