Skip to contentSkip to conversation

tools headers UAPI: Update tools's copy of drm.h headers

tip: perf/urgent tip-bot2 for Arnaldo Carvalho de Melo 1 participant 1 message Dec 6, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

tip-bot2 for Arnaldo Carvalho de Melo

author merge bot Applied
#1 lore raw

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     fd9bee5e24141d00e23b66d1b51bc759efa7e3fe
Gitweb:        https://git.kernel.org/tip/fd9bee5e24141d00e23b66d1b51bc759efa7e3fe
Author:        Arnaldo Carvalho de Melo <[email protected]>
AuthorDate:    Wed, 04 Dec 2019 12:53:16 -03:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Wed, 04 Dec 2019 16:22:38 -03:00

tools headers UAPI: Update tools's copy of drm.h headers

Picking the changes from:

2093dea3def9 ("drm/syncobj: extend syncobj query ability v3")

Which doesn't affect tooling, just silences this perf build warning:

Warning: Kernel ABI header at 'tools/include/uapi/drm/drm.h' differs from latest version at 'include/uapi/drm/drm.h' diff -u tools/include/uapi/drm/drm.h include/uapi/drm/drm.h

---
 tools/include/uapi/drm/drm.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/include/uapi/drm/drm.h +2 -1
index 8a5b2f8..868bf79 100644
@@ -778,11 +778,12 @@ struct drm_syncobj_array {
 	__u32 pad;
 };
 
+#define DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED (1 << 0) /* last available point on timeline syncobj */
 struct drm_syncobj_timeline_array {
 	__u64 handles;
 	__u64 points;
 	__u32 count_handles;
-	__u32 pad;
+	__u32 flags;
 };