[<prev] [next>] [day] [month] [year] [list]
Message-ID: <157561941435.21853.6754518610466999114.tip-bot2@tip-bot2>
Date: Fri, 06 Dec 2019 08:03:34 -0000
From: "tip-bot2 for Arnaldo Carvalho de Melo" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Adrian Hunter <adrian.hunter@...el.com>, christian.koenig@....com,
Chunming Zhou <david1.zhou@....com>,
Jiri Olsa <jolsa@...nel.org>,
Namhyung Kim <namhyung@...nel.org>,
Arnaldo Carvalho de Melo <acme@...hat.com>,
x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org>
Subject: [tip: perf/urgent] tools headers UAPI: Update tools's copy of drm.h headers
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 <acme@...hat.com>
AuthorDate: Wed, 04 Dec 2019 12:53:16 -03:00
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
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
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Christian König <christian.koenig@....com>
Cc: Chunming Zhou <david1.zhou@....com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Link: https://lkml.kernel.org/n/tip-t1xqmjffo4rxdw395dsnu34j@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/include/uapi/drm/drm.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/include/uapi/drm/drm.h b/tools/include/uapi/drm/drm.h
index 8a5b2f8..868bf79 100644
--- a/tools/include/uapi/drm/drm.h
+++ b/tools/include/uapi/drm/drm.h
@@ -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;
};
Powered by blists - more mailing lists