OSDN Git Service

Don't forget to set the memrange private, and reset ring on kernel entry.
authorEric Anholt <eric@anholt.net>
Sat, 3 May 2008 00:50:46 +0000 (17:50 -0700)
committerEric Anholt <eric@anholt.net>
Sat, 3 May 2008 00:50:46 +0000 (17:50 -0700)
linux-core/i915_gem.c

index e0beeb4..8a30d84 100644 (file)
@@ -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.
         */