diff mbox

[2/2] drm/i915: Remove the bind in mmap_gtt_ioctl

Message ID 1271972322-18780-2-git-send-email-oga@openbsd.org (mailing list archive)
State Deferred, archived
Headers show

Commit Message

Owain Ainsworth April 22, 2010, 9:38 p.m. UTC
None
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a9da182..935cd83 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1426,20 +1426,6 @@  i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
 
 	args->offset = obj_priv->mmap_offset;
 
-	/*
-	 * Pull it into the GTT so that we have a page list (makes the
-	 * initial fault faster and any subsequent flushing possible).
-	 */
-	if (!obj_priv->agp_mem) {
-		ret = i915_gem_object_bind_to_gtt(obj, 0);
-		if (ret) {
-			drm_gem_object_unreference(obj);
-			mutex_unlock(&dev->struct_mutex);
-			return ret;
-		}
-		list_add_tail(&obj_priv->list, &dev_priv->mm.inactive_list);
-	}
-
 	drm_gem_object_unreference(obj);
 	mutex_unlock(&dev->struct_mutex);