From d1bb1b43b8db0926715d4bb1bbd9abcb88a4c5ee Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.org.uk>
Date: Thu, 18 Jun 2009 12:01:47 +0100
Subject: 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>
---
 drivers/mfd/glamo/glamo-cmdq.c | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

(limited to 'drivers/mfd/glamo/glamo-cmdq.c')

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",
-- 
cgit v1.2.3