etnaviv: remove "fence" argument from etnaviv_commit()

The "fence" pointer to etnaviv_commit() no longer provides any useful
purpose - we never made use of the fence ID returned through this
pointer.  Remove it.

Signed-off-by: Russell King <rmk@armlinux.org.uk>

3 files changed, 12 insertions, 17 deletions

diff --git a/etnaviv/etnaviv.c b/etnaviv/etnaviv.c
index 5674b07..c7aa682 100644
--- a/etnaviv/etnaviv.c
+++ b/etnaviv/etnaviv.c
@@ -154,10 +154,9 @@ static void etnaviv_flush_callback(CallbackListPtr *list, pointer user_data,
 {
 	ScrnInfoPtr pScrn = user_data;
 	struct etnaviv *etnaviv = pScrn->privates[etnaviv_private_index].ptr;
-	uint32_t fence;
 
 	if (pScrn->vtSema && etnaviv_fence_batch_pending(&etnaviv->fence_head))
-		etnaviv_commit(etnaviv, FALSE, &fence);
+		etnaviv_commit(etnaviv, FALSE);
 }
 
 static void etnaviv_retire_vpix_fence(struct etnaviv_fence_head *fh,
@@ -484,7 +483,7 @@ static Bool etnaviv_CloseScreen(CLOSE_SCREEN_ARGS_DECL)
 #endif
 
 	/* Ensure everything has been committed */
-	etnaviv_commit(etnaviv, TRUE, NULL);
+	etnaviv_commit(etnaviv, TRUE);
 
 	pixmap = pScreen->GetScreenPixmap(pScreen);
 	etnaviv_free_pixmap(pixmap);
@@ -793,10 +792,9 @@ static void etnaviv_BlockHandler(BLOCKHANDLER_ARGS_DECL)
 {
 	SCREEN_PTR(arg);
 	struct etnaviv *etnaviv = etnaviv_get_screen_priv(pScreen);
-	uint32_t fence;
 
 	if (etnaviv_fence_batch_pending(&etnaviv->fence_head))
-		etnaviv_commit(etnaviv, FALSE, &fence);
+		etnaviv_commit(etnaviv, FALSE);
 
 	mark_flush();
 
diff --git a/etnaviv/etnaviv_accel.c b/etnaviv/etnaviv_accel.c
index 38d4f89..5cbe155 100644
--- a/etnaviv/etnaviv_accel.c
+++ b/etnaviv/etnaviv_accel.c
@@ -51,7 +51,7 @@ void etnaviv_batch_wait_commit(struct etnaviv *etnaviv,
 		return;
 
 	case B_PENDING:
-		etnaviv_commit(etnaviv, TRUE, NULL);
+		etnaviv_commit(etnaviv, TRUE);
 		break;
 
 	case B_FENCED:
@@ -176,23 +176,20 @@ static Bool etnaviv_init_src_pixmap(struct etnaviv *etnaviv,
 	return TRUE;
 }
 
-void etnaviv_commit(struct etnaviv *etnaviv, Bool stall, uint32_t *fence)
+void etnaviv_commit(struct etnaviv *etnaviv, Bool stall)
 {
 	struct etna_ctx *ctx = etnaviv->ctx;
-	uint32_t tmp_fence;
+	uint32_t fence;
 	int ret;
 
-	if (!fence && stall)
-		fence = &tmp_fence;
-
-	ret = etna_flush(ctx, fence);
+	ret = etna_flush(ctx, &fence);
 	if (ret) {
 		etnaviv_error(etnaviv, "etna_flush", ret);
 		return;
 	}
 
 	if (stall) {
-		ret = viv_fence_finish(etnaviv->conn, *fence,
+		ret = viv_fence_finish(etnaviv->conn, fence,
 				       VIV_WAIT_INDEFINITE);
 		if (ret != VIV_STATUS_OK)
 			etnaviv_error(etnaviv, "fence finish", ret);
@@ -205,14 +202,14 @@ void etnaviv_commit(struct etnaviv *etnaviv, Bool stall, uint32_t *fence)
 		etnaviv_fence_retire_all(&etnaviv->fence_head);
 
 		/* Record the completed fence ID */
-		etnaviv->last_fence = *fence;
-	} else if (fence) {
+		etnaviv->last_fence = fence;
+	} else {
 		/*
 		 * After these operations have been committed, we assign
 		 * a fence to them, and place them on the ordered list
 		 * of fenced pixmaps.
 		 */
-		etnaviv_fence_objects(&etnaviv->fence_head, *fence);
+		etnaviv_fence_objects(&etnaviv->fence_head, fence);
 	}
 }
 
diff --git a/etnaviv/etnaviv_accel.h b/etnaviv/etnaviv_accel.h
index 0079a4a..5098bf9 100644
--- a/etnaviv/etnaviv_accel.h
+++ b/etnaviv/etnaviv_accel.h
@@ -212,7 +212,7 @@ Bool etnaviv_accel_PolyFillRectSolid(DrawablePtr pDrawable, GCPtr pGC, int n,
 Bool etnaviv_accel_PolyFillRectTiled(DrawablePtr pDrawable, GCPtr pGC, int n,
 	xRectangle * prect);
 
-void etnaviv_commit(struct etnaviv *etnaviv, Bool stall, uint32_t *fence);
+void etnaviv_commit(struct etnaviv *etnaviv, Bool stall);
 void etnaviv_finish_fences(struct etnaviv *etnaviv, uint32_t fence);
 
 void etnaviv_batch_wait_commit(struct etnaviv *etnaviv, struct etnaviv_pixmap *vPix);