drm/syncobj: Fix compilation following partial revert

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

Fixes: 131280a162e7 ("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: Christian König <christian.koenig@amd.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20181112152130.12275-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index 90e0a6dce0869cdf5e33f98424e2ea2e74530c4f..e2c5b3ca48240693fa5b23d95e9e039800ab663b 100644 (file)
--- 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 f90a09b83370745a24b48d0c5544d3a270805a6b..09187286d34627df882e4ede753db7e40da41934 100644 (file)
--- 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;