Commit 0bc23aad authored Sep 14, 2010 by 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: Chris Wilson <chris@chris-wilson.co.uk>

parent 7213342d

drivers/gpu/drm/i915/i915_gem.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -2430,7 +2430,11 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj)
		int ret;

		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;
		}