xserver/hw/kdrive/ati radeon_composite.c,1.14,1.15

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/ati
In directory gabe:/tmp/cvs-serv4231/hw/kdrive/ati

Modified Files:
	radeon_composite.c 
Log Message:
Use RadeonSwitchTo3D() instead of doing the WAIT_UNTIL ourselves
(RST3D() also does DC_FLUSH, which may be important).


Index: radeon_composite.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/radeon_composite.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- radeon_composite.c	22 Dec 2004 18:39:41 -0000	1.14
+++ radeon_composite.c	20 Jan 2005 07:28:02 -0000	1.15
@@ -293,9 +293,9 @@
 		is_transform[1] = FALSE;
 	}
 
-	BEGIN_DMA(14);
-	OUT_REG(ATI_REG_WAIT_UNTIL,
-		RADEON_WAIT_HOST_IDLECLEAN | RADEON_WAIT_2D_IDLECLEAN);
+	RadeonSwitchTo3D(atis);
+
+	BEGIN_DMA(12);
 
 	/* RADEON_REG_PP_CNTL,
 	 * RADEON_REG_RB3D_CNTL, 
@@ -512,9 +512,9 @@
 		is_transform[1] = FALSE;
 	}
 
-	BEGIN_DMA(22);
-	OUT_REG(ATI_REG_WAIT_UNTIL,
-		RADEON_WAIT_HOST_IDLECLEAN | RADEON_WAIT_2D_IDLECLEAN);
+	RadeonSwitchTo3D(atis);
+
+	BEGIN_DMA(20);
 
 	/* RADEON_REG_PP_CNTL,
 	 * RADEON_REG_RB3D_CNTL, 
@@ -713,9 +713,9 @@
 	if (((dst_pitch >> pixel_shift) & 0x7) != 0)
 		ATI_FALLBACK(("Bad destination pitch 0x%x\n", dst_pitch));
 
-	BEGIN_DMA(10);
-	OUT_REG(ATI_REG_WAIT_UNTIL,
-		RADEON_WAIT_HOST_IDLECLEAN | RADEON_WAIT_2D_IDLECLEAN);
+	RadeonSwitchTo3D(atis);
+
+	BEGIN_DMA(8);
 
 	/* RADEON_REG_PP_CNTL,
 	 * RADEON_REG_RB3D_CNTL,