---

yaml --- r: 306993 b: refs/heads/master c: 3ae5378 h: refs/heads/master i: 306991: d34d12e v: v3
git-mirror · Mar 27, 2012 · 4cfbca6 · 4cfbca6
1 parent d7bf703
commit 4cfbca6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0356fc373517bc19713c9ff3aeedccbcc2ef7a4
+refs/heads/master: 3ae5378330f581466b05bcea2dd3bc8731a598cb
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -808,6 +808,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
 	}
 
 	if (obj->gtt_space &&
+	    obj->cache_level == I915_CACHE_NONE &&
 	    obj->base.write_domain != I915_GEM_DOMAIN_CPU) {
 		ret = i915_gem_object_pin(obj, 0, true);
 		if (ret)