2 files changed, 1 insertions, 5 deletions

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index 90e0a6dce086..e2c5b3ca4824 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -277,10 +277,6 @@ 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/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index f90a09b83370..09187286d346 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -2157,7 +2157,7 @@ await_fence_array(struct i915_execbuffer *eb,
                 if (!(flags & I915_EXEC_FENCE_WAIT))
                         continue;
 
-                drm_syncobj_search_fence(syncobj, 0, 0, &fence);
+                fence = drm_syncobj_fence_get(syncobj);
                 if (!fence)
                         return -EINVAL;