---

yaml --- r: 260167 b: refs/heads/master c: b97c3d9 h: refs/heads/master i: 260165: cd14bd0 260163: a0b0600 260159: c5774c1 v: v3
git-mirror · Jun 25, 2011 · 80ca054 · 80ca054
1 parent 3ca769d
commit 80ca054
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: 2cd1176bd9e92924242e779dcc5c8fc922f96659
+refs/heads/master: b97c3d9c1655522be3adc5ae1aa153a18467e924
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2155,15 +2155,15 @@ static void i915_gem_object_finish_gtt(struct drm_i915_gem_object *obj)
 {
 	u32 old_write_domain, old_read_domains;
 
-	if ((obj->base.read_domains & I915_GEM_DOMAIN_GTT) == 0)
-		return;
-
 	/* 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;
+
 	old_read_domains = obj->base.read_domains;
 	old_write_domain = obj->base.write_domain;