drm/syncobj: disable the timeline UAPI for now v2

Until we have sorted out all problems. v2: return -EINVAL during create if flag is set. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/260937/
mariux64 · Nov 8, 2018 · 783195e · 783195e
1 parent d9be05b
commit 783195e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
@@ -483,6 +483,10 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,
 	int ret;
 	struct drm_syncobj *syncobj;
 
+	/* Disabled for now */
+	if (flags & DRM_SYNCOBJ_CREATE_TYPE_TIMELINE)
+		return -EINVAL;
+
 	syncobj = kzalloc(sizeof(struct drm_syncobj), GFP_KERNEL);
 	if (!syncobj)
 		return -ENOMEM;

diff --git a/include/drm/drm_syncobj.h b/include/drm/drm_syncobj.h
@@ -30,6 +30,9 @@
 
 struct drm_syncobj_cb;
 
+/* Move the define here for the moment to avoid exposing the UAPI just yet */
+#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1)
+
 enum drm_syncobj_type {
 	DRM_SYNCOBJ_TYPE_BINARY,
 	DRM_SYNCOBJ_TYPE_TIMELINE

diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
@@ -717,7 +717,6 @@ struct drm_prime_handle {
 struct drm_syncobj_create {
 	__u32 handle;
 #define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0)
-#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1)
 	__u32 flags;
 };