---

yaml --- r: 307157 b: refs/heads/master c: c07496f h: refs/heads/master i: 307155: f342869 v: v3
git-mirror · Apr 15, 2012 · 3d7c47b · 3d7c47b
1 parent e38abe3
commit 3d7c47b
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: d1e61e7fc4456c4cb9a33ed182edf40e34ddedea
+refs/heads/master: c07496fa61f4c5cb2addd1c57f6b22fcaeea2eeb
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -876,6 +876,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
 
 	if (obj->gtt_space &&
 	    obj->cache_level == I915_CACHE_NONE &&
+	    obj->tiling_mode == I915_TILING_NONE &&
 	    obj->map_and_fenceable &&
 	    obj->base.write_domain != I915_GEM_DOMAIN_CPU) {
 		ret = i915_gem_gtt_pwrite_fast(dev, obj, args, file);