From 44af0e86160500b32d1adf645f243fad4bf173ed Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 25 Oct 2011 16:39:59 +0200
Subject: [PATCH] --- yaml --- r: 282663 b: refs/heads/master c:
 aa38e2e01521f88e9b0230c0236d2bd89d0af0ed h: refs/heads/master i:   282661:
 e9d46139f45e5fac357d090c5d5f85266e87bfae   282659:
 e168c3b8075a9ed78ee5857a4a956b2f1a6a8967   282655:
 4ace1b22b189b221fdf374558920a22424a600bf v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/gpu/drm/drm_sman.c | 38 --------------------------------
 trunk/include/drm/drm_sman.h     | 19 ----------------
 3 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/[refs] b/[refs]
index bcb0e54f2a7f..a372d850f814 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c828e20456301b0f5192a1f75e8bf8a6afd15551
+refs/heads/master: aa38e2e01521f88e9b0230c0236d2bd89d0af0ed
diff --git a/trunk/drivers/gpu/drm/drm_sman.c b/trunk/drivers/gpu/drm/drm_sman.c
index 462cdc87cdb8..9d03cdc1a914 100644
--- a/trunk/drivers/gpu/drm/drm_sman.c
+++ b/trunk/drivers/gpu/drm/drm_sman.c
@@ -279,27 +279,6 @@ static void drm_sman_remove_owner(struct drm_sman *sman,
 	kfree(owner_item);
 }
 
-int drm_sman_owner_clean(struct drm_sman *sman, unsigned long owner)
-{
-
-	struct drm_hash_item *hash_item;
-	struct drm_owner_item *owner_item;
-
-	if (drm_ht_find_item(&sman->owner_hash_tab, owner, &hash_item)) {
-		return -1;
-	}
-
-	owner_item = drm_hash_entry(hash_item, struct drm_owner_item, owner_hash);
-	if (owner_item->mem_blocks.next == &owner_item->mem_blocks) {
-		drm_sman_remove_owner(sman, owner_item);
-		return -1;
-	}
-
-	return 0;
-}
-
-EXPORT_SYMBOL(drm_sman_owner_clean);
-
 static void drm_sman_do_owner_cleanup(struct drm_sman *sman,
 				      struct drm_owner_item *owner_item)
 {
@@ -312,23 +291,6 @@ static void drm_sman_do_owner_cleanup(struct drm_sman *sman,
 	drm_sman_remove_owner(sman, owner_item);
 }
 
-void drm_sman_owner_cleanup(struct drm_sman *sman, unsigned long owner)
-{
-
-	struct drm_hash_item *hash_item;
-	struct drm_owner_item *owner_item;
-
-	if (drm_ht_find_item(&sman->owner_hash_tab, owner, &hash_item)) {
-
-		return;
-	}
-
-	owner_item = drm_hash_entry(hash_item, struct drm_owner_item, owner_hash);
-	drm_sman_do_owner_cleanup(sman, owner_item);
-}
-
-EXPORT_SYMBOL(drm_sman_owner_cleanup);
-
 void drm_sman_cleanup(struct drm_sman *sman)
 {
 	struct drm_owner_item *entry, *next;
diff --git a/trunk/include/drm/drm_sman.h b/trunk/include/drm/drm_sman.h
index 3b65ccfd1400..d5ed903867e3 100644
--- a/trunk/include/drm/drm_sman.h
+++ b/trunk/include/drm/drm_sman.h
@@ -148,25 +148,6 @@ extern struct drm_memblock_item *drm_sman_alloc(struct drm_sman * sman,
 extern int drm_sman_free_key(struct drm_sman * sman, unsigned int key);
 extern void drm_sman_free(struct drm_memblock_item *item);
 
-/*
- * returns 1 iff there are no stale memory blocks associated with this owner.
- * Typically called to determine if we need to idle the hardware and call
- * drm_sman_owner_cleanup. If there are no stale memory blocks, it removes all
- * resources associated with owner.
- */
-
-extern int drm_sman_owner_clean(struct drm_sman * sman, unsigned long owner);
-
-/*
- * Frees all stale memory blocks associated with this owner. Note that this
- * requires that the hardware is finished with all blocks, so the graphics engine
- * should be idled before this call is made. This function also frees
- * any resources associated with "owner" and should be called when owner
- * is not going to be referenced anymore.
- */
-
-extern void drm_sman_owner_cleanup(struct drm_sman * sman, unsigned long owner);
-
 /*
  * Frees all stale memory blocks associated with the memory manager.
  * See idling above.