From 752506bd417f4f9d6cce1cff8561490c6fb3aabe Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue, 20 Nov 2012 12:16:51 +0000
Subject: [PATCH] --- yaml --- r: 345359 b: refs/heads/master c:
 5293908afa04b651cc8a7e85ba0938b71f97c2f8 h: refs/heads/master i:   345357:
 f25f468f459e2e21f45f50edd0634e01a009e873   345355:
 c7976e4044664b3a65cdbf632459d01ad2b6b075   345351:
 85575c91f2be72173cf01be9d14efd9a5908eed7   345343:
 b8d0a94533e8a45f425899b66391367c86b375e7 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/gpu/drm/ttm/ttm_object.c | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0a41f0d1e240..cd7706b1591f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae8df2ae8aa27bfeb8d1b99e8adaac5810a97fa8
+refs/heads/master: 5293908afa04b651cc8a7e85ba0938b71f97c2f8
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_object.c b/trunk/drivers/gpu/drm/ttm/ttm_object.c
index 0e13d9f059ff..58a5f3261c0b 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_object.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_object.c
@@ -157,11 +157,11 @@ int ttm_base_object_init(struct ttm_object_file *tfile,
 	base->refcount_release = refcount_release;
 	base->ref_obj_release = ref_obj_release;
 	base->object_type = object_type;
-	spin_lock(&tdev->object_lock);
 	kref_init(&base->refcount);
-	ret = drm_ht_just_insert_please(&tdev->object_hash,
-					&base->hash,
-					(unsigned long)base, 31, 0, 0);
+	spin_lock(&tdev->object_lock);
+	ret = drm_ht_just_insert_please_rcu(&tdev->object_hash,
+					    &base->hash,
+					    (unsigned long)base, 31, 0, 0);
 	spin_unlock(&tdev->object_lock);
 	if (unlikely(ret != 0))
 		goto out_err0;
@@ -175,7 +175,7 @@ int ttm_base_object_init(struct ttm_object_file *tfile,
 	return 0;
 out_err1:
 	spin_lock(&tdev->object_lock);
-	(void)drm_ht_remove_item(&tdev->object_hash, &base->hash);
+	(void)drm_ht_remove_item_rcu(&tdev->object_hash, &base->hash);
 	spin_unlock(&tdev->object_lock);
 out_err0:
 	return ret;
@@ -189,8 +189,15 @@ static void ttm_release_base(struct kref *kref)
 	struct ttm_object_device *tdev = base->tfile->tdev;
 
 	spin_lock(&tdev->object_lock);
-	(void)drm_ht_remove_item(&tdev->object_hash, &base->hash);
+	(void)drm_ht_remove_item_rcu(&tdev->object_hash, &base->hash);
 	spin_unlock(&tdev->object_lock);
+
+	/*
+	 * Note: We don't use synchronize_rcu() here because it's far
+	 * too slow. It's up to the user to free the object using
+	 * call_rcu() or ttm_base_object_kfree().
+	 */
+
 	if (base->refcount_release) {
 		ttm_object_file_unref(&base->tfile);
 		base->refcount_release(&base);
@@ -216,7 +223,7 @@ struct ttm_base_object *ttm_base_object_lookup(struct ttm_object_file *tfile,
 	int ret;
 
 	rcu_read_lock();
-	ret = drm_ht_find_item(&tdev->object_hash, key, &hash);
+	ret = drm_ht_find_item_rcu(&tdev->object_hash, key, &hash);
 
 	if (likely(ret == 0)) {
 		base = drm_hash_entry(hash, struct ttm_base_object, hash);