move i915_gem_fault a bit closer to Linux 3.4.33

1 files changed, 12 insertions, 11 deletions

diff --git a/sys/dev/pci/drm/i915_gem.c b/sys/dev/pci/drm/i915_gem.c
index df5862fbbb0..afa68270e14 100644
--- a/sys/dev/pci/drm/i915_gem.c
+++ b/sys/dev/pci/drm/i915_gem.c
@@ -603,20 +603,21 @@ i915_gem_fault(struct drm_obj *gem_obj, struct uvm_faultinfo *ufi,
 			printf("%s: failed to bind\n", __func__);
 			goto error;
 		}
+
+		ret = i915_gem_object_set_to_gtt_domain(obj, write);
+		if (ret) {
+			panic("%s: failed to set to gtt (%d)\n",
+			    __func__, ret);
+			goto error;
+		}
 	}
 
-	/*
-	 * We could only do this on bind so allow for map_buffer_range
-	 * unsynchronised objects (where buffer suballocation
-	 * is done by the GL application), however it gives coherency problems
-	 * normally.
-	 */
-	ret = i915_gem_object_set_to_gtt_domain(obj, write);
-	if (ret) {
-		panic("%s: failed to set to gtt (%d)\n",
-		    __func__, ret);
+	if (obj->tiling_mode == I915_TILING_NONE)
+		ret = i915_gem_object_put_fence(obj);
+	else
+		ret = i915_gem_object_get_fence(obj);
+	if (ret)
 		goto error;
-	}
 
 	if (i915_gem_object_is_inactive(obj))
 		list_move_tail(&obj->mm_list, &dev_priv->mm.inactive_list);