From 189cd825a8a2cc2c0a28023589a5f18a4122410b Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Mon, 2 Mar 2009 16:26:58 -0500
Subject: [PATCH] Revert "R6xx/R7xx: don't pad ring for IB age submission"

This reverts commit 7f96e792f45d48e565cc332616acee7cecb6c44e.

This is fixed in the DDX, EXA composite was leaking dma buffers
in some cases:
radeon: 4ad1c4decfee653dbbc1ea2ca4270487be622382
rhd: 9c8ab2dfbe61120298c4b46a2b49245c6779dbc2
---
 shared-core/r600_cp.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/shared-core/r600_cp.c b/shared-core/r600_cp.c
index 50ad2c1d..207f050f 100644
--- a/shared-core/r600_cp.c
+++ b/shared-core/r600_cp.c
@@ -2583,8 +2583,14 @@ static void r600_cp_discard_buffer(struct drm_device * dev, struct drm_buf * buf
 	buf_priv->age = ++dev_priv->sarea_priv->last_dispatch;
 
 	/* Emit the vertex buffer age */
-	BEGIN_RING(2);
+	BEGIN_RING(8);
 	R600_DISPATCH_AGE(buf_priv->age);
+	OUT_RING(CP_PACKET2());
+	OUT_RING(CP_PACKET2());
+	OUT_RING(CP_PACKET2());
+	OUT_RING(CP_PACKET2());
+	OUT_RING(CP_PACKET2());
+	OUT_RING(CP_PACKET2());
 	ADVANCE_RING();
 
 	buf->pending = 1;