diff options
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 6f5ad0802fcd..0a85e7b5d592 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
@@ -86,7 +86,7 @@ static int radeon_ttm_global_init(struct radeon_device *rdev) | |||
86 | rdev->mman.mem_global_ref.object; | 86 | rdev->mman.mem_global_ref.object; |
87 | global_ref = &rdev->mman.bo_global_ref.ref; | 87 | global_ref = &rdev->mman.bo_global_ref.ref; |
88 | global_ref->global_type = TTM_GLOBAL_TTM_BO; | 88 | global_ref->global_type = TTM_GLOBAL_TTM_BO; |
89 | global_ref->size = sizeof(struct ttm_mem_global); | 89 | global_ref->size = sizeof(struct ttm_bo_global); |
90 | global_ref->init = &ttm_bo_global_init; | 90 | global_ref->init = &ttm_bo_global_init; |
91 | global_ref->release = &ttm_bo_global_release; | 91 | global_ref->release = &ttm_bo_global_release; |
92 | r = ttm_global_item_ref(global_ref); | 92 | r = ttm_global_item_ref(global_ref); |
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)); |