From 8ef61c8348f3c2c27ada7087fff6b51d3c7fea83 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 5 Jul 2011 15:37:55 +0100
Subject: [PATCH] --- yaml --- r: 259673 b: refs/heads/master c:
 5338afdfb5eeaefeefd9dcdb06977920eca5d941 h: refs/heads/master i:   259671:
 9a1c25f84e3cd3ca881a084648f8831eccda0234 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/gma500/gem_glue.c |  9 +++++++++
 trunk/drivers/staging/gma500/psb_gem.c  | 15 +--------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index bbf96767e481..bc539f4fd609 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 078d6f71677cda935ed182dbb391e946e13766ec
+refs/heads/master: 5338afdfb5eeaefeefd9dcdb06977920eca5d941
diff --git a/trunk/drivers/staging/gma500/gem_glue.c b/trunk/drivers/staging/gma500/gem_glue.c
index 0e7364ba1d4b..779ac1a12d24 100644
--- a/trunk/drivers/staging/gma500/gem_glue.c
+++ b/trunk/drivers/staging/gma500/gem_glue.c
@@ -42,6 +42,15 @@ int drm_gem_private_object_init(struct drm_device *dev,
 
 void drm_gem_object_release_wrap(struct drm_gem_object *obj)
 {
+	/* Remove the list map if one is present */
+	if (obj->map_list.map) {
+		struct drm_gem_mm *mm = obj->dev->mm_private;
+		struct drm_map_list *list = &obj->map_list;
+		drm_ht_remove_item(&mm->offset_hash, &list->hash);
+		drm_mm_put_block(list->file_offset_node);
+		kfree(list->map);
+		list->map = NULL;
+	}
 	if (obj->filp)
 		drm_gem_object_release(obj);
 }
diff --git a/trunk/drivers/staging/gma500/psb_gem.c b/trunk/drivers/staging/gma500/psb_gem.c
index 1e7faaeee14c..a63ad9e54dd2 100644
--- a/trunk/drivers/staging/gma500/psb_gem.c
+++ b/trunk/drivers/staging/gma500/psb_gem.c
@@ -19,12 +19,8 @@
  * Authors: Alan Cox
  *
  * TODO:
- *	-	we don't actually put GEM objects into the GART yet
- *	-	we need to work out if the MMU is relevant as well (eg for
+ *	-	we need to work out if the MMU is relevant (eg for
  *		accelerated operations on a GEM object)
- *	-	cache coherency
- *
- * ie this is just an initial framework to get us going.
  */
 
 #include <drm/drmP.h>
@@ -40,15 +36,6 @@ int psb_gem_init_object(struct drm_gem_object *obj)
 void psb_gem_free_object(struct drm_gem_object *obj)
 {
 	struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);
-	if (obj->map_list.map) {
-		/* Do things GEM should do for us */
-		struct drm_gem_mm *mm = obj->dev->mm_private;
-		struct drm_map_list *list = &obj->map_list;
-		drm_ht_remove_item(&mm->offset_hash, &list->hash);
-		drm_mm_put_block(list->file_offset_node);
-		kfree(list->map);
-		list->map = NULL;
-	}
 	drm_gem_object_release_wrap(obj);
 	/* This must occur last as it frees up the memory of the GEM object */
 	psb_gtt_free_range(obj->dev, gtt);