From 80ca0545cee1deeaee4ac4aeb15c8f5f0b95b212 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 24 Jun 2011 21:02:59 -0700 Subject: [PATCH] --- yaml --- r: 260167 b: refs/heads/master c: b97c3d9c1655522be3adc5ae1aa153a18467e924 h: refs/heads/master i: 260165: cd14bd06cb2c0009d56c32e89db6256a8b0d6a99 260163: a0b06001e620011b7228b074b23bf7af3fa20ae1 260159: c5774c1b4cfba67eb264ee7e9f6339c1ddc7578c 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 d0c7119a9306..afe581eecd94 100644 --- 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 index b29e0f2b780a..6026817372da 100644 --- 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;