Commit 783195ec authored by Christian König's avatar Christian König
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/260937/
parent d9be05b7

drivers/gpu/drm/drm_syncobj.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

include/drm/drm_syncobj.h

+3 −0
Original line number Diff line number Diff line
@@ -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

include/uapi/drm/drm.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

};