From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu, 20 Aug 2009 08:29:08 +0000 (+0200)
Subject: drm/ttm: Fixes for "Make parts of a struct ttm_bo_device global"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f5f4db2d50ea1af8f160686d2e97bbfa5102b4f;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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>
---

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 6f5ad0802fc..0a85e7b5d59 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)
 		rdev->mman.mem_global_ref.object;
 	global_ref = &rdev->mman.bo_global_ref.ref;
 	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->release = &ttm_bo_global_release;
 	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 fa87ccbcc6c..87c06252d46 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)
 	struct ttm_bo_global *glob =
 		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);
 	__free_page(glob->dummy_read_page);
 	kfree(glob);
@@ -1456,8 +1455,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 	int ret = -EINVAL;
 
 	rwlock_init(&bdev->vm_lock);
-	spin_lock_init(&glob->lru_lock);
-
 	bdev->driver = driver;
 
 	memset(bdev->man, 0, sizeof(bdev->man));