From 9459af72807804accbe54bb162635c3dae7396cd Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 9 Oct 2012 19:24:38 +0100
Subject: [PATCH] --- yaml --- r: 358015 b: refs/heads/master c:
 97c809fd9cf5e914322b53773ad0d67efe503fde h: refs/heads/master i:   358013:
 636c7ac6fefa68d34719fd5037591ef11f9f5cf4   358011:
 ccda8f9a726ba86826294f49f024a2458351fbb3   358007:
 0f49061e0c1a2f5637342faf7a5b9baa1322052c   357999:
 2a892aa081ff87c02f5e3d657a077fbc6266a105   357983:
 8667212b8cb08d86c333cd4626f8aa8cf0247628   357951:
 ef7560fd74042bd966c1d52870d87e91182e2353   357887:
 39060d6c853344568e172c506ef3657dd28626e4 v: v3

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

diff --git a/[refs] b/[refs]
index 51583c5789a0..263f7261c4be 100644
--- 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
index ce706555d011..5bb370fdc99c 100644
--- 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;