[Bug 97343] gem cancel_userptr warning

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=97343

--- Comment #11 from Chris Wilson <chris at chris-wilson.co.uk> ---
Magic fix:

index 1f63a45fd6b0..fa9486608ddf 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -279,12 +279,15 @@ static const struct drm_i915_gem_object_ops
i915_gem_phys_ops = {
        .release = i915_gem_object_release_phys,
 };

-int
-i915_gem_object_unbind(struct drm_i915_gem_object *obj)
+int i915_gem_object_unbind(struct drm_i915_gem_object *obj)
 {
        struct i915_vma *vma;
        LIST_HEAD(still_in_list);
-       int ret = 0;
+       int ret;
+
+       ret = i915_gem_object_wait_rendering(obj, false);
+       if (ret)
+               return ret;

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are the assignee for the bug.
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20160814/8e975162/attachment.html>