Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_render.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_render.c,v
retrieving revision 1.10
diff -u -p -r1.10 radeon_render.c
--- programs/Xserver/hw/xfree86/drivers/ati/radeon_render.c	18 Oct 2004 15:19:44 -0000	1.10
+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_render.c	30 Nov 2004 11:24:13 -0000
@@ -471,16 +471,20 @@ static Bool FUNC_NAME(R100SetupTexture)(
     RADEONRestoreByteswap(info);
 #endif
 
-    BEGIN_ACCEL(5);
+    BEGIN_ACCEL(7);
     OUT_ACCEL_REG(RADEON_PP_TXFORMAT_0, txformat);
     OUT_ACCEL_REG(RADEON_PP_TEX_SIZE_0, tex_size);
     OUT_ACCEL_REG(RADEON_PP_TEX_PITCH_0, dst_pitch - 32);
     OUT_ACCEL_REG(RADEON_PP_TXOFFSET_0, offset + info->fbLocation +
 					pScrn->fbOffset);
-    OUT_ACCEL_REG(RADEON_PP_TXFILTER_0, RADEON_MAG_FILTER_LINEAR |
-					RADEON_MIN_FILTER_LINEAR |
+    OUT_ACCEL_REG(RADEON_PP_TXFILTER_0, RADEON_MAG_FILTER_NEAREST |
+					RADEON_MIN_FILTER_NEAREST |
 					RADEON_CLAMP_S_WRAP |
 					RADEON_CLAMP_T_WRAP);
+    OUT_ACCEL_REG(RADEON_RB2D_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL);
+    OUT_ACCEL_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_2D_IDLECLEAN |
+		                     RADEON_WAIT_3D_IDLECLEAN |
+				     RADEON_WAIT_HOST_IDLECLEAN);
     FINISH_ACCEL();
 
     return TRUE;