---

yaml
---
r: 188971
b: refs/heads/master
c: fe30519
h: refs/heads/master
i:
  188969: 64cc85e
  188967: ccface7
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8956c8bba5b11b3d3aec000e6c6184943011a8d4
+refs/heads/master: fe305198d4bf481d6dd017df35c566c9d477fada

trunk/drivers/gpu/drm/i915/i915_gem_tiling.c

@@ -325,9 +325,12 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
 		 * need to ensure that any fence register is cleared.
 		 */
 		if (!i915_gem_object_fence_offset_ok(obj, args->tiling_mode))
-		    ret = i915_gem_object_unbind(obj);
+			ret = i915_gem_object_unbind(obj);
+		else if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
+			ret = i915_gem_object_put_fence_reg(obj);
 		else
-		    ret = i915_gem_object_put_fence_reg(obj);
+			i915_gem_release_mmap(obj);
+
 		if (ret != 0) {
 			WARN(ret != -ERESTARTSYS,
 			     "failed to reset object for tiling switch");