From 4a38ebab484e450d837e8004213e6468d9d8e2b5 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 4 Nov 2010 17:04:29 +0100
Subject: [PATCH] --- yaml --- r: 228692 b: refs/heads/master c:
 818f2a3cc34b0673dccd4188ce4a1862d9d90127 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8476bde007cc..19e3a02c3b09 100644
--- 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
index f1e4eca44866..a2cd579eb9b2 100644
--- 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;