---

yaml --- r: 358015 b: refs/heads/master c: 97c809f h: refs/heads/master i: 358013: 636c7ac 358011: ccda8f9 358007: 0f49061 357999: 2a892aa 357983: 8667212 357951: ef7560f 357887: 39060d6 v: v3
git-mirror · Jan 20, 2013 · 9459af7 · 9459af7
1 parent 0b6187f
commit 9459af7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0a57789d5ec807fc218151b2fb2de4da30fbef5
+refs/heads/master: 97c809fd9cf5e914322b53773ad0d67efe503fde
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2407,15 +2407,15 @@ static void i915_gem_object_finish_gtt(struct drm_i915_gem_object *obj)
 {
 	u32 old_write_domain, old_read_domains;
 
-	/* Act a barrier for all accesses through the GTT */
-	mb();
-
 	/* Force a pagefault for domain tracking on next user access */
 	i915_gem_release_mmap(obj);
 
 	if ((obj->base.read_domains & I915_GEM_DOMAIN_GTT) == 0)
 		return;
 
+	/* Wait for any direct GTT access to complete */
+	mb();
+
 	old_read_domains = obj->base.read_domains;
 	old_write_domain = obj->base.write_domain;