diff options
author | Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 2009-06-22 23:07:26 +0200 |
---|---|---|
committer | Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 2009-06-22 23:37:06 +0200 |
commit | 9a33f62be1c478334572ea9384af60c37d1644a0 (patch) | |
tree | 96a6f2c36cf6915c9b1a848d0b7979984990968d /linux-core/drm_stub.c | |
parent | 81644198aeced288d26e17fadd8e5eb19798352f (diff) |
drm: Strip old ttm.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Diffstat (limited to 'linux-core/drm_stub.c')
-rw-r--r-- | linux-core/drm_stub.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c index 1518bc6d..6e68f677 100644 --- a/linux-core/drm_stub.c +++ b/linux-core/drm_stub.c @@ -98,7 +98,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, init_timer(&dev->timer); mutex_init(&dev->struct_mutex); mutex_init(&dev->ctxlist_mutex); - mutex_init(&dev->bm.evict_mutex); idr_init(&dev->drw_idr); @@ -115,17 +114,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, if (drm_ht_create(&dev->map_hash, DRM_MAP_HASH_ORDER)) { return -ENOMEM; } - if (drm_mm_init(&dev->offset_manager, DRM_FILE_PAGE_OFFSET_START, - DRM_FILE_PAGE_OFFSET_SIZE)) { - drm_ht_remove(&dev->map_hash); - return -ENOMEM; - } - - if (drm_ht_create(&dev->object_hash, DRM_OBJECT_HASH_ORDER)) { - drm_ht_remove(&dev->map_hash); - drm_mm_takedown(&dev->offset_manager); - return -ENOMEM; - } /* the DRM has 6 counters */ dev->counters = 6; @@ -171,8 +159,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, } } - drm_fence_manager_init(dev); - return 0; error_out_unreg: |