From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 6 Sep 2013 23:10:27 +0000 (-0400)
Subject: r600g: remove DMA padding
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9bc47dbe5062fe1f462f62bf3a2dda7b2f3ddea3;p=mesa.git

r600g: remove DMA padding

This is now handled in the winsys.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index b4b8c886f64..aa5cadf93e9 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -217,20 +217,11 @@ static void r600_flush_dma_ring(void *ctx, unsigned flags)
 {
 	struct r600_context *rctx = (struct r600_context *)ctx;
 	struct radeon_winsys_cs *cs = rctx->b.rings.dma.cs;
-	unsigned padding_dw, i;
 
 	if (!cs->cdw) {
 		return;
 	}
 
-	/* Pad the DMA CS to a multiple of 8 dwords. */
-	padding_dw = 8 - cs->cdw % 8;
-	if (padding_dw < 8) {
-		for (i = 0; i < padding_dw; i++) {
-			cs->buf[cs->cdw++] = DMA_PACKET(DMA_PACKET_NOP, 0, 0, 0);
-		}
-	}
-
 	rctx->b.rings.dma.flushing = true;
 	rctx->b.ws->cs_flush(cs, flags, 0);
 	rctx->b.rings.dma.flushing = false;