Mesa (master): radeon/uvd: move alignment to winsys

[Christian König]

Module: Mesa
Branch: master
Commit: f9f14201c18fcb4ba73605e20f015c00e70c1cdd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9f14201c18fcb4ba73605e20f015c00e70c1cdd

Author: Christian König <christian.koenig at amd.com>
Date:   Sun Sep 22 10:41:27 2013 +0200

radeon/uvd: move alignment to winsys

Similar to GFX and DMA.

Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeon/radeon_uvd.c       |    6 ------
 src/gallium/winsys/radeon/drm/radeon_drm_cs.c |    6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c
index fa81105..a8b17e6 100644
--- a/src/gallium/drivers/radeon/radeon_uvd.c
+++ b/src/gallium/drivers/radeon/radeon_uvd.c
@@ -104,12 +104,6 @@ static unsigned alloc_stream_handle()
 /* flush IB to the hardware */
 static void flush(struct ruvd_decoder *dec)
 {
-	uint32_t *pm4 =	dec->cs->buf;
-
-	// align IB
-	while(dec->cs->cdw % 16)
-		pm4[dec->cs->cdw++] = RUVD_PKT2();
-
 	dec->ws->cs_flush(dec->cs, RADEON_FLUSH_ASYNC, 0);
 }
 
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
index d530011..62f7704 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c
@@ -494,6 +494,12 @@ static void radeon_drm_cs_flush(struct radeon_winsys_cs *rcs, unsigned flags, ui
 			    OUT_CS(&cs->base, 0x80000000); /* type2 nop packet */
 	    }
 	    break;
+    case RING_UVD:
+            while (rcs->cdw & 15)
+		OUT_CS(&cs->base, 0x80000000); /* type2 nop packet */
+	    break;
+    default:
+	    break;
     }
 
     if (rcs->cdw > RADEON_MAX_CMDBUF_DWORDS) {