Revert "Front buffer kludge"

That wasn't the right way to go about this.  And it didn't compile.

This reverts commit d8e4b9ff4dc8bf57e53fa174f977c8fb00ec4e90.

Signed-off-by: Thomas White <taw@bitwiz.org.uk>

6 files changed, 22 insertions, 79 deletions

diff --git a/drivers/mfd/glamo/glamo-buffer.c b/drivers/mfd/glamo/glamo-buffer.c
index ecf9cefc74c..945824a1b15 100644
--- a/drivers/mfd/glamo/glamo-buffer.c
+++ b/drivers/mfd/glamo/glamo-buffer.c
@@ -27,54 +27,6 @@
 #include "glamo-drm-private.h"
 
 
-int glamo_ioctl_gem_info(struct drm_device *dev, void *data,
-				struct drm_file *file_priv)
-{
-	struct drm_glamo_gem_info *args = data;
-	struct glamodrm_handle *gdrm;
-	int ret;
-
-	gdrm = dev->dev_private;
-
-	/* Have we decided on a name for the front buffer yet? */
-	if ( gdrm->front_buffer_handle ) {
-		args->front_buffer_handle = gdrm->front_buffer_handle;
-	} else {
-
-		/* "Baptise" the front buffer */
-		struct drm_gem_object *obj;
-		struct drm_glamo_gem_object *gobj;
-		uint32_t handle;
-
-		/* We don't really care about this object - it's only being
-		 * created so we can generate a handle to refer to the front
-		 * buffer which X can use for the screen pixmap. */
-		obj = drm_gem_object_alloc(dev, PAGE_SIZE);
-		if (obj == NULL) return -ENOMEM;
-
-		gobj = obj->driver_private;
-
-		ret = drm_gem_handle_create(file_priv, obj, &handle);
-		mutex_lock(&dev->struct_mutex);
-		drm_gem_object_handle_unreference(obj);
-		mutex_unlock(&dev->struct_mutex);
-		if (ret) return ret;
-
-		/* The handle is specific to this context */
-		printk(KERN_INFO "[glamo-drm] Front buffer handle: %i\n",
-		                 handle);
-
-		args->front_buffer_handle = handle;
-		gdrm->front_buffer_handle = handle;
-
-	}
-
-	args->vram_size = gdrm->vram_size;
-
-	return 0;
-}
-
-
 int glamo_ioctl_gem_create(struct drm_device *dev, void *data,
 			   struct drm_file *file_priv)
 {
@@ -82,7 +34,7 @@ int glamo_ioctl_gem_create(struct drm_device *dev, void *data,
 	struct drm_gem_object *obj;
 	struct glamodrm_handle *gdrm;
 	struct drm_glamo_gem_object *gobj;
-	uint32_t handle, ret;
+	int handle, ret;
 
 	gdrm = dev->dev_private;
 
@@ -233,7 +185,6 @@ int glamo_buffer_init(struct glamodrm_handle *gdrm)
 {
 	gdrm->mmgr = drm_calloc(1, sizeof(struct drm_mm), DRM_MEM_DRIVER);
 	drm_mm_init(gdrm->mmgr, 0, gdrm->vram_size);
-	gdrm->front_buffer_handle = 0;
 	return 0;
 }
 
diff --git a/drivers/mfd/glamo/glamo-buffer.h b/drivers/mfd/glamo/glamo-buffer.h
index d326ecfac9e..7d87e428d79 100644
--- a/drivers/mfd/glamo/glamo-buffer.h
+++ b/drivers/mfd/glamo/glamo-buffer.h
@@ -36,9 +36,6 @@ extern int glamodrm_gem_init_object(struct drm_gem_object *obj);
 
 extern void glamodrm_gem_free_object(struct drm_gem_object *obj);
 
-extern int glamo_ioctl_gem_info(struct drm_device *dev, void *data,
-				struct drm_file *file_priv);
-
 extern int glamo_ioctl_gem_create(struct drm_device *dev, void *data,
 				  struct drm_file *file_priv);
 
diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c
index 3c410f828da..32fad98be8a 100644
--- a/drivers/mfd/glamo/glamo-cmdq.c
+++ b/drivers/mfd/glamo/glamo-cmdq.c
@@ -243,7 +243,6 @@ static int glamo_do_relocation(struct glamodrm_handle *gdrm,
 			       struct drm_file *file_priv)
 {
 	u32 *handles;
-	u32 front_handle;
 	int *offsets;
 	int nobjs =  cbuf->nobjs;
 	int i;
@@ -260,8 +259,6 @@ static int glamo_do_relocation(struct glamodrm_handle *gdrm,
 	if ( copy_from_user(offsets, cbuf->obj_pos, nobjs*sizeof(int)) )
 		return -1;
 
-	front_handle = gdrm->front_buffer_handle;
-
 	for ( i=0; i<nobjs; i++ ) {
 
 		u32 handle = handles[i];
@@ -280,29 +277,22 @@ static int glamo_do_relocation(struct glamodrm_handle *gdrm,
 			goto fail;
 		}
 
-		if ( handle == front_handle ) {
-
-			addr = GLAMO_OFFSET_FRAMEBUFFER;
-
-		} else {
-			obj = drm_gem_object_lookup(dev, file_priv, handle);
-			if ( obj == NULL ) return -1;
+		obj = drm_gem_object_lookup(dev, file_priv, handle);
+		if ( obj == NULL ) return -1;
 
-			/* Unref the object now, or it'll never get freed.
-			 * This should really happen after the GPU has finished
-			 * the commands which are about to be submitted. */
-			drm_gem_object_unreference(obj);
+		/* Unref the object now, or it'll never get freed.
+		 * This should really happen after the GPU has finished
+		 * the commands which are about to be submitted. */
+		drm_gem_object_unreference(obj);
 
-			gobj = obj->driver_private;
-			if ( gobj == NULL ) {
-				printk(KERN_WARNING "[glamo-drm] This object "
-				                    "has no private data!\n");
-				goto fail;
-			}
-
-			addr = GLAMO_OFFSET_WORK + gobj->block->start;
+		gobj = obj->driver_private;
+		if ( gobj == NULL ) {
+			printk(KERN_WARNING "[glamo-drm] This object has no "
+					    "private data!\n");
+			goto fail;
 		}
 
+		addr = GLAMO_OFFSET_WORK + gobj->block->start;
 		addr_low = addr & 0xffff;
 		addr_high = (addr >> 16) & 0x7f;
 		printk(KERN_INFO "Addr low 0x%x, high 0x%x\n",
diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
index c5929aa48eb..856622d9e76 100644
--- a/drivers/mfd/glamo/glamo-drm-drv.c
+++ b/drivers/mfd/glamo/glamo-drm-drv.c
@@ -49,6 +49,14 @@ static int glamo_ioctl_swap(struct drm_device *dev, void *data,
 }
 
 
+static int glamo_ioctl_gem_info(struct drm_device *dev, void *data,
+				struct drm_file *file_priv)
+{
+	printk(KERN_INFO "glamo_ioctl_gem_info\n");
+	return 0;
+}
+
+
 static int glamo_ioctl_gem_wait_rendering(struct drm_device *dev, void *data,
 					  struct drm_file *file_priv)
 {
diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h
index 07ee1b1041b..4cc5877e118 100644
--- a/drivers/mfd/glamo/glamo-drm-private.h
+++ b/drivers/mfd/glamo/glamo-drm-private.h
@@ -61,9 +61,6 @@ struct glamodrm_handle {
 
 	/* semaphore against concurrent ioctl */
 	struct semaphore add_to_ring;
-
-	/* Front buffer kludge */
-	uint32_t front_buffer_handle;
 };
 
 /* Private data.  This is where we keep our memory management bits */
diff --git a/include/drm/glamo_drm.h b/include/drm/glamo_drm.h
index 147415f5cbe..c14873d6527 100644
--- a/include/drm/glamo_drm.h
+++ b/include/drm/glamo_drm.h
@@ -75,8 +75,8 @@ typedef struct drm_glamo_cmd_buffer {
 } drm_glamo_cmd_buffer_t;
 
 struct drm_glamo_gem_info {
+	uint64_t vram_start;
 	uint64_t vram_size;
-	uint32_t front_buffer_handle;
 };
 
 struct drm_glamo_gem_create {