---

yaml --- r: 228692 b: refs/heads/master c: 818f2a3 h: refs/heads/master v: v3
git-mirror · Nov 4, 2010 · 4a38eba · 4a38eba
1 parent 82c1626
commit 4a38eba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46168f39360f419e59952d58cd08a862886ec8cd
+refs/heads/master: 818f2a3cc34b0673dccd4188ce4a1862d9d90127
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1461,8 +1461,7 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev,
 		BUG();
 	}
 
-	ret = i915_gem_object_pin(obj, alignment,
-				  !pipelined || obj_priv->tiling_mode,
+	ret = i915_gem_object_pin(obj, alignment, true,
 				  obj_priv->tiling_mode);
 	if (ret)
 		return ret;