Merge drm/drm-next into drm-misc-next

[linux.git] / drivers / gpu / drm / i915 / i915_gem_execbuffer.c

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 09187286d34627df882e4ede753db7e40da41934..f90a09b83370745a24b48d0c5544d3a270805a6b 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;
 
-               fence = drm_syncobj_fence_get(syncobj);
+               drm_syncobj_search_fence(syncobj, 0, 0, &fence);
                if (!fence)
                        return -EINVAL;