---

yaml --- r: 228790 b: refs/heads/master c: 6bda10d h: refs/heads/master v: v3
git-mirror · Dec 5, 2010 · 95f551f · 95f551f
1 parent ea8144f
commit 95f551f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cdab21f9a1fca50dd27e488839f5a6578e333b2
+refs/heads/master: 6bda10d152735c22baf1dcd92937420b4b0a359a
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2484,6 +2484,9 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj,
 	struct drm_i915_fence_reg *reg;
 	int ret;
 
+	/* XXX disable pipelining. There are bugs. Shocking. */
+	pipelined = NULL;
+
 	/* Just update our place in the LRU if our fence is getting reused. */
 	if (obj->fence_reg != I915_FENCE_REG_NONE) {
 		reg = &dev_priv->fence_regs[obj->fence_reg];
@@ -2556,9 +2559,8 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj,
 		if (old->tiling_mode)
 			i915_gem_release_mmap(old);
 
-		/* XXX The pipelined change over appears to be incoherent. */
 		ret = i915_gem_object_flush_fence(old,
-						  NULL, //pipelined,
+						  pipelined,
 						  interruptible);
 		if (ret) {
 			drm_gem_object_unreference(&old->base);