---

yaml --- r: 228690 b: refs/heads/master c: 085ce26 h: refs/heads/master v: v3
git-mirror · Nov 3, 2010 · 7956edc · 7956edc
1 parent 77d47b9
commit 7956edc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27153f72d04bcd83b3a66e219418a21d6269553b
+refs/heads/master: 085ce2643713830cf772c12c1a16da9d0ba83f36
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -4151,6 +4151,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment,
 	int ret;
 
 	BUG_ON(obj_priv->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT);
+	BUG_ON(need_fence && !mappable);
 	WARN_ON(i915_verify_lists(dev));
 
 	if (obj_priv->gtt_space != NULL) {

diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1462,7 +1462,8 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev,
 	}
 
 	ret = i915_gem_object_pin(obj, alignment,
-				  !pipelined, obj_priv->tiling_mode);
+				  !pipelined || obj_priv->tiling_mode,
+				  obj_priv->tiling_mode);
 	if (ret)
 		return ret;