summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-11-08 11:39:46 +0300
committerChristian König <christian.koenig@amd.com>2018-11-08 13:31:34 +0300
commit783195ec1cada862d54dee8f312a60bcbba5c0e4 (patch)
tree7e4480c5be424d30bbab9034551695452517f3c4
parentd9be05b784225e68cf0c9b95180d3081b4663745 (diff)
downloadlinux-783195ec1cada862d54dee8f312a60bcbba5c0e4.tar.xz
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/
-rw-r--r--drivers/gpu/drm/drm_syncobj.c4
-rw-r--r--include/drm/drm_syncobj.h3
-rw-r--r--include/uapi/drm/drm.h1
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index da8175d9c6ff..da2b85eec6cf 100644
--- 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 29244cbcd05e..ffd1f4fcf519 100644
--- 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 cebdb2541eb7..300f336633f2 100644
--- 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;
};