mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/syncobj: disable the timeline UAPI for now v2

Browse source 
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/
This commit is contained in:
Christian König 2018-11-08 09:39:46 +01:00
parent d9be05b784
commit 783195ec1c
3 changed files with 7 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/drm_syncobj.c
View file

@ -483,6 +483,10 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,
int ret; int ret;
struct drm_syncobj *syncobj; struct drm_syncobj *syncobj;
/* Disabled for now */
if (flags & DRM_SYNCOBJ_CREATE_TYPE_TIMELINE)
return -EINVAL;
syncobj = kzalloc(sizeof(struct drm_syncobj), GFP_KERNEL); syncobj = kzalloc(sizeof(struct drm_syncobj), GFP_KERNEL);
if (!syncobj) if (!syncobj)
return -ENOMEM; return -ENOMEM;

3
include/drm/drm_syncobj.h
View file

@ -30,6 +30,9 @@
struct drm_syncobj_cb; 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 { enum drm_syncobj_type {
DRM_SYNCOBJ_TYPE_BINARY, DRM_SYNCOBJ_TYPE_BINARY,
DRM_SYNCOBJ_TYPE_TIMELINE DRM_SYNCOBJ_TYPE_TIMELINE

1
include/uapi/drm/drm.h
View file

@ -717,7 +717,6 @@ struct drm_prime_handle {
struct drm_syncobj_create { struct drm_syncobj_create {
__u32 handle; __u32 handle;
#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0) #define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0)
#define DRM_SYNCOBJ_CREATE_TYPE_TIMELINE (1 << 1)
__u32 flags; __u32 flags;
}; };