diff options
author | Dave Airlie <airlied@redhat.com> | 2010-07-07 12:37:37 +0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-07-07 12:37:37 +0400 |
commit | a907a2e7d287f2b89fd81bc8edf164c0008c624f (patch) | |
tree | d93fecbe492cb9f65e6253d10a2f55333b8800de /drivers/gpu/drm/i915 | |
parent | db8cc27b804f89e8fd5f9d5385161956a777c471 (diff) | |
parent | 709ea97145c125b3811ff70429e90ebdb0e832e5 (diff) | |
download | linux-a907a2e7d287f2b89fd81bc8edf164c0008c624f.tar.xz |
Merge branch 'drm-intel-lru' into drm-testing
* drm-intel-lru:
drm: implement helper functions for scanning lru list
drm_mm: extract check_free_mm_node
drm: sane naming for drm_mm.c
drm: kill dead code in drm_mm.c
drm: kill drm_mm_node->private
drm: use list_for_each_entry in drm_mm.c
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 074385882ccf..75061b305b8c 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2633,10 +2633,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 (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; - } } if (obj_priv->gtt_space == NULL) { /* If the gtt is empty and we're still having trouble |