---

yaml --- r: 307178 b: refs/heads/master c: 7b09638 h: refs/heads/master v: v3
git-mirror · Apr 18, 2012 · aa19f82 · aa19f82
1 parent 0d00b2a
commit aa19f82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bf3f452362841404fe6d4589883f9471842ef8b
+refs/heads/master: 7b09638f45379fd1f8cbcb0a95ea2b11f0c8b850
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -381,7 +381,11 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,
 		uint32_t __iomem *reloc_entry;
 		void __iomem *reloc_page;
 
-		ret = i915_gem_object_set_to_gtt_domain(obj, 1);
+		ret = i915_gem_object_set_to_gtt_domain(obj, true);
+		if (ret)
+			return ret;
+
+		ret = i915_gem_object_put_fence(obj);
 		if (ret)
 			return ret;