---

yaml --- r: 196550 b: refs/heads/master c: 31770bd h: refs/heads/master v: v3
git-mirror · May 10, 2010 · 2c1146d · 2c1146d
1 parent 4f74990
commit 2c1146d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 149c36a346f63fa4be7d1432d7b1b3095a95bf47
+refs/heads/master: 31770bd49ab157c5639043ad7541c3e0c83afcc4
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c b/trunk/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -283,6 +283,11 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
 		return -EINVAL;
 	}
 
+	if (obj_priv->pin_count) {
+		drm_gem_object_unreference_unlocked(obj);
+		return -EBUSY;
+	}
+
 	if (args->tiling_mode == I915_TILING_NONE) {
 		args->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
 		args->stride = 0;