Merge tag 'v2.6.35-rc6' into drm-radeon-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / i915_gem.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 51bd301cf10d9002555177d95b28e86703145d67..15d2d93aaca997f551bd82cc6222a5963b9bd607 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2634,10 +2634,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
        if (free_space != NULL) {
                obj_priv->gtt_space = drm_mm_get_block(free_space, obj->size,
                                                       alignment);
        if (free_space != NULL) {
                obj_priv->gtt_space = drm_mm_get_block(free_space, obj->size,
                                                       alignment);

-               if (obj_priv->gtt_space != NULL) {
-                       obj_priv->gtt_space->private = obj;
+               if (obj_priv->gtt_space != NULL)

                        obj_priv->gtt_offset = obj_priv->gtt_space->start;
                        obj_priv->gtt_offset = obj_priv->gtt_space->start;

-               }

        }
        if (obj_priv->gtt_space == NULL) {
                /* If the gtt is empty and we're still having trouble
        }
        if (obj_priv->gtt_space == NULL) {
                /* If the gtt is empty and we're still having trouble