]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/nouveau: remove unused ttm bo list
authorBen Skeggs <bskeggs@redhat.com>
Mon, 2 Aug 2010 06:28:19 +0000 (16:28 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 5 Aug 2010 22:33:41 +0000 (08:33 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_mem.c

index 3ca8343c15df9608c444140d9853603a94fd49a6..84f85183d041f38d9d848137abf24b236a32626f 100644 (file)
@@ -51,9 +51,6 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo)
        if (nvbo->tile)
                nv10_mem_expire_tiling(dev, nvbo->tile, NULL);
 
-       spin_lock(&dev_priv->ttm.bo_list_lock);
-       list_del(&nvbo->head);
-       spin_unlock(&dev_priv->ttm.bo_list_lock);
        kfree(nvbo);
 }
 
@@ -166,9 +163,6 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan,
        }
        nvbo->channel = NULL;
 
-       spin_lock(&dev_priv->ttm.bo_list_lock);
-       list_add_tail(&nvbo->head, &dev_priv->ttm.bo_list);
-       spin_unlock(&dev_priv->ttm.bo_list_lock);
        *pnvbo = nvbo;
        return 0;
 }
index e15db15dca77507ec13614ecc2cac5d2ec147bd4..db10809e91311897059b6277c87c04dd34b1f31d 100644 (file)
@@ -536,8 +536,6 @@ struct drm_nouveau_private {
                struct drm_global_reference mem_global_ref;
                struct ttm_bo_global_ref bo_global_ref;
                struct ttm_bo_device bdev;
-               spinlock_t bo_list_lock;
-               struct list_head bo_list;
                atomic_t validate_sequence;
        } ttm;
 
index a9f36ab256b72b535a098c8dd3aeed06dc9c2ea6..1f80dc6f81c2f3b6964e9901d5602d0efa2ceb7d 100644 (file)
@@ -459,8 +459,6 @@ nouveau_mem_init(struct drm_device *dev)
                return ret;
        }
 
-       INIT_LIST_HEAD(&dev_priv->ttm.bo_list);
-       spin_lock_init(&dev_priv->ttm.bo_list_lock);
        spin_lock_init(&dev_priv->tile.lock);
 
        dev_priv->fb_available_size = dev_priv->vram_size;