diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2009-08-20 04:29:08 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-08-20 04:58:13 -0400 |
commit | 7f5f4db2d50ea1af8f160686d2e97bbfa5102b4f (patch) | |
tree | f4111bd9f9ddb0f815ad52cb87d55253034eb322 /drivers/gpu/drm/ttm/ttm_bo.c | |
parent | 51c8b4071d84d46cc100baa5931ad06b2a823c95 (diff) |
drm/ttm: Fixes for "Make parts of a struct ttm_bo_device global"
ttm:
Remove a stray debug printout.
Remove a re-init of the lru spinlock at device init.
radeon:
Fix the size of the bo_global allocation.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo.c')
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index fa87ccbcc6ce..87c06252d464 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c | |||
@@ -1333,7 +1333,6 @@ static void ttm_bo_global_kobj_release(struct kobject *kobj) | |||
1333 | struct ttm_bo_global *glob = | 1333 | struct ttm_bo_global *glob = |
1334 | container_of(kobj, struct ttm_bo_global, kobj); | 1334 | container_of(kobj, struct ttm_bo_global, kobj); |
1335 | 1335 | ||
1336 | printk(KERN_INFO TTM_PFX "Freeing bo global.\n"); | ||
1337 | ttm_mem_unregister_shrink(glob->mem_glob, &glob->shrink); | 1336 | ttm_mem_unregister_shrink(glob->mem_glob, &glob->shrink); |
1338 | __free_page(glob->dummy_read_page); | 1337 | __free_page(glob->dummy_read_page); |
1339 | kfree(glob); | 1338 | kfree(glob); |
@@ -1456,8 +1455,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev, | |||
1456 | int ret = -EINVAL; | 1455 | int ret = -EINVAL; |
1457 | 1456 | ||
1458 | rwlock_init(&bdev->vm_lock); | 1457 | rwlock_init(&bdev->vm_lock); |
1459 | spin_lock_init(&glob->lru_lock); | ||
1460 | |||
1461 | bdev->driver = driver; | 1458 | bdev->driver = driver; |
1462 | 1459 | ||
1463 | memset(bdev->man, 0, sizeof(bdev->man)); | 1460 | memset(bdev->man, 0, sizeof(bdev->man)); |