Commit 7f5f4db2 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie

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: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 51c8b407
...@@ -86,7 +86,7 @@ static int radeon_ttm_global_init(struct radeon_device *rdev) ...@@ -86,7 +86,7 @@ static int radeon_ttm_global_init(struct radeon_device *rdev)
rdev->mman.mem_global_ref.object; rdev->mman.mem_global_ref.object;
global_ref = &rdev->mman.bo_global_ref.ref; global_ref = &rdev->mman.bo_global_ref.ref;
global_ref->global_type = TTM_GLOBAL_TTM_BO; global_ref->global_type = TTM_GLOBAL_TTM_BO;
global_ref->size = sizeof(struct ttm_mem_global); global_ref->size = sizeof(struct ttm_bo_global);
global_ref->init = &ttm_bo_global_init; global_ref->init = &ttm_bo_global_init;
global_ref->release = &ttm_bo_global_release; global_ref->release = &ttm_bo_global_release;
r = ttm_global_item_ref(global_ref); r = ttm_global_item_ref(global_ref);
......
...@@ -1333,7 +1333,6 @@ static void ttm_bo_global_kobj_release(struct kobject *kobj) ...@@ -1333,7 +1333,6 @@ static void ttm_bo_global_kobj_release(struct kobject *kobj)
struct ttm_bo_global *glob = struct ttm_bo_global *glob =
container_of(kobj, struct ttm_bo_global, kobj); container_of(kobj, struct ttm_bo_global, kobj);
printk(KERN_INFO TTM_PFX "Freeing bo global.\n");
ttm_mem_unregister_shrink(glob->mem_glob, &glob->shrink); ttm_mem_unregister_shrink(glob->mem_glob, &glob->shrink);
__free_page(glob->dummy_read_page); __free_page(glob->dummy_read_page);
kfree(glob); kfree(glob);
...@@ -1456,8 +1455,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev, ...@@ -1456,8 +1455,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
int ret = -EINVAL; int ret = -EINVAL;
rwlock_init(&bdev->vm_lock); rwlock_init(&bdev->vm_lock);
spin_lock_init(&glob->lru_lock);
bdev->driver = driver; bdev->driver = driver;
memset(bdev->man, 0, sizeof(bdev->man)); memset(bdev->man, 0, sizeof(bdev->man));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment