Skip to content

Commit c71bc59

Browse files
committed
tools headers UAPI: Sync the drm/drm.h with the kernel sources
Picking the changes from: c2d3a73 ("drm/syncobj: Extend EXPORT_SYNC_FILE for timeline syncobjs") Silencing these perf build warnings: Warning: Kernel ABI header differences: diff -u tools/include/uapi/drm/drm.h include/uapi/drm/drm.h No changes in tooling as these are just C comment documentation changes: $ tools/perf/trace/beauty/drm_ioctl.sh > before $ cp include/uapi/drm/drm.h tools/include/uapi/drm/drm.h $ tools/perf/trace/beauty/drm_ioctl.sh > after $ diff -u before after $ Cc: Adrian Hunter <[email protected]> Cc: Christian König <[email protected]> Cc: Ian Rogers <[email protected]> Cc: James Clark <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Kan Liang <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Rob Clark <[email protected]> Link: https://lore.kernel.org/r/aErtHs3T2hdPjjHx@x1 Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 47684bf commit c71bc59

File tree

1 file changed

+4
-0
lines changed
  • tools/include/uapi/drm

1 file changed

+4
-0
lines changed

tools/include/uapi/drm/drm.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,13 +905,17 @@ struct drm_syncobj_destroy {
905905
};
906906

907907
#define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE (1 << 0)
908+
#define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_TIMELINE (1 << 1)
908909
#define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE (1 << 0)
910+
#define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_TIMELINE (1 << 1)
909911
struct drm_syncobj_handle {
910912
__u32 handle;
911913
__u32 flags;
912914

913915
__s32 fd;
914916
__u32 pad;
917+
918+
__u64 point;
915919
};
916920

917921
struct drm_syncobj_transfer {

0 commit comments

Comments
 (0)