Index: r300_cmdbuf.c
===================================================================
RCS file: /cvsroot/r300/r300_driver/r300/r300_cmdbuf.c,v
retrieving revision 1.44
diff -u -b -B -u -r1.44 r300_cmdbuf.c
--- r300_cmdbuf.c	27 Jun 2005 15:56:14 -0000	1.44
+++ r300_cmdbuf.c	21 Aug 2005 18:05:52 -0000
@@ -570,7 +609,7 @@
 		  GLint srcx, GLint srcy,
 		  GLint dstx, GLint dsty, GLuint w, GLuint h)
 {
-	drm_radeon_cmd_header_t *cmd;
+	drm_r300_cmd_header_t *cmd;
 
 	if (RADEON_DEBUG & DEBUG_IOCTL)
 		fprintf(stderr,
@@ -585,13 +624,13 @@
 	assert(w < (1 << 16));
 	assert(h < (1 << 16));
 
-	cmd =
-	    (drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, 8,
+	cmd = (drm_r300_cmd_header_t *) r300AllocCmdBuf(rmesa, 8,
 							__FUNCTION__);
 
-	cmd[0].header.cmd_type = R300_CMD_PACKET3;
-	cmd[1].i = R200_CP_CMD_BITBLT_MULTI | (5 << 16);
-	cmd[2].i = (RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
+	cmd[0].packet3.cmd_type = R300_CMD_PACKET3;
+	cmd[0].packet3.packet = R300_CMD_PACKET3_RAW;
+	cmd[1].u = R200_CP_CMD_BITBLT_MULTI | (5 << 16);
+	cmd[2].u = (RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
 		    RADEON_GMC_DST_PITCH_OFFSET_CNTL |
 		    RADEON_GMC_BRUSH_NONE |
 		    (color_fmt << 8) |
@@ -600,28 +639,24 @@
 		    RADEON_DP_SRC_SOURCE_MEMORY |
 		    RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS);
 
-	cmd[3].i = ((src_pitch / 64) << 22) | (src_offset >> 10);
-	cmd[4].i = ((dst_pitch / 64) << 22) | (dst_offset >> 10);
-	cmd[5].i = (srcx << 16) | srcy;
-	cmd[6].i = (dstx << 16) | dsty;	/* dst */
-	cmd[7].i = (w << 16) | h;
+	cmd[3].u = ((src_pitch / 64) << 22) | (src_offset >> 10);
+	cmd[4].u = ((dst_pitch / 64) << 22) | (dst_offset >> 10);
+	cmd[5].u = (srcx << 16) | srcy;
+	cmd[6].u = (dstx << 16) | dsty;	/* dst */
+	cmd[7].u = (w << 16) | h;
 }
 
 void r300EmitWait(r300ContextPtr rmesa, GLuint flags)
 {
-	if (rmesa->radeon.dri.drmMinor >= 6) {
-		drm_radeon_cmd_header_t *cmd;
+	drm_r300_cmd_header_t *cmd;
 
 		assert(!(flags & ~(R300_WAIT_2D | R300_WAIT_3D)));
 
-		cmd =
-		    (drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa,
-								1,
+	cmd = (drm_r300_cmd_header_t *) r300AllocCmdBuf(rmesa, 1,
 								__FUNCTION__);
-		cmd[0].i = 0;
+	cmd[0].u = 0;
 		cmd[0].wait.cmd_type = R300_CMD_WAIT;
 		cmd[0].wait.flags = flags;
-	}
 }
 
 void r300EmitAOS(r300ContextPtr rmesa, GLuint nr, GLuint offset)