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/

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index da8175d9c6ffcbaf4d7acb82f2d18da34f1acb6b..da2b85eec6cff7cc26d632e87fe201ac68655211 100644 (file)
--- 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
index 29244cbcd05e127d643cc3dc055a324b1708a0de..ffd1f4fcf519ca3f22651a3f13e7c15050711e7c 100644 (file)
--- 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
index cebdb2541eb7abaff23d127b55ac556297a49782..300f336633f28ea20493570f80a73e30d87cd087 100644 (file)
--- 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;
 };