From: Eric Anholt <eric@anholt.net>
Date: Sat, 3 May 2008 00:50:46 +0000 (-0700)
Subject: Don't forget to set the memrange private, and reset ring on kernel entry.
X-Git-Tag: android-x86-1.6~256^2~159
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=166ff364fb09ec9885a164fca517c079a1d88718;p=android-x86%2Fexternal-libdrm.git

Don't forget to set the memrange private, and reset ring on kernel entry.
---

diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index e0beeb43..8a30d846 100644
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -122,7 +122,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
 						     alignment);
 	if (obj_priv->gtt_space == NULL)
 		return -ENOMEM;
-
+	obj_priv->gtt_space->private = obj;
 	obj_priv->gtt_offset = obj_priv->gtt_space->start;
 
 	DRM_DEBUG("Binding object of size %d at 0x%08x\n", obj->size, obj_priv->gtt_offset);
@@ -300,6 +300,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
 
+	i915_kernel_lost_context(dev);
+
 	DRM_INFO ("%s:%d\n", __FUNCTION__, __LINE__);
 	/* Big hammer: flush and idle the hardware so we can map things in/out.
 	 */