Commit 91324069 authored by Chris Wilson's avatar Chris Wilson Committed by Sean Paul

drm/syncobj: Fix compilation following partial revert

We need to include the revert of commit 783195ec ("drm/syncobj:
disable the timeline UAPI for now v2") along with undoing the change to
drm/i915.

Fixes: 131280a1 ("drm: Revert syncobj timeline changes.")
Cc: Christian König <christian.koenig@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Chunming Zhou <david1.zhou@amd.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20181112152130.12275-1-chris@chris-wilson.co.uk
parent 131280a1
...@@ -277,10 +277,6 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags, ...@@ -277,10 +277,6 @@ 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;
......
...@@ -2157,7 +2157,7 @@ await_fence_array(struct i915_execbuffer *eb, ...@@ -2157,7 +2157,7 @@ await_fence_array(struct i915_execbuffer *eb,
if (!(flags & I915_EXEC_FENCE_WAIT)) if (!(flags & I915_EXEC_FENCE_WAIT))
continue; continue;
drm_syncobj_search_fence(syncobj, 0, 0, &fence); fence = drm_syncobj_fence_get(syncobj);
if (!fence) if (!fence)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment