Commit 0bc23aad authored by Chris Wilson's avatar Chris Wilson

drm/i915: Fix regression in ba3d8d74

I pulled the wrong version of the patch from Daniel Vetter which was
missing the read barriers -- and the one that was causing all the trouble
was from i915_gem_object_put_fence_reg(), leading to GPU hangs on gen3.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 7213342d
...@@ -2430,12 +2430,16 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj) ...@@ -2430,12 +2430,16 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj)
int ret; int ret;
ret = i915_gem_object_flush_gpu_write_domain(obj, false); ret = i915_gem_object_flush_gpu_write_domain(obj, false);
if (ret != 0) if (ret)
return ret;
ret = i915_gem_object_wait_rendering(obj);
if (ret)
return ret; return ret;
} }
i915_gem_object_flush_gtt_write_domain(obj); i915_gem_object_flush_gtt_write_domain(obj);
i915_gem_clear_fence_reg (obj); i915_gem_clear_fence_reg(obj);
return 0; return 0;
} }
......
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