Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c,v
retrieving revision 1.4
diff -p -u -r1.4 radeon_cursor.c
--- programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	4 Aug 2004 13:17:31 -0000	1.4
+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	28 Mar 2005 03:38:03 -0000
@@ -74,17 +74,25 @@ static CARD32 mono_cursor_color[] = {
 
 #define CURSOR_SWAPPING_DECL_MMIO   unsigned char *RADEONMMIO = info->MMIO;
 #define CURSOR_SWAPPING_START() \
+  do { \
     OUTREG(RADEON_SURFACE_CNTL, \
 	   (info->ModeReg.surface_cntl | \
 	    RADEON_NONSURF_AP0_SWP_32BPP) & \
-	   ~RADEON_NONSURF_AP0_SWP_16BPP)
+	   ~RADEON_NONSURF_AP0_SWP_16BPP); \
+    if (info->accel && info->accel->Sync) \
+	info->accel->Sync(pScrn); \
+  } while (0)
 #define CURSOR_SWAPPING_END()	(OUTREG(RADEON_SURFACE_CNTL, \
 					info->ModeReg.surface_cntl))
 
 #else
 
 #define CURSOR_SWAPPING_DECL_MMIO
-#define CURSOR_SWAPPING_START()
+#define CURSOR_SWAPPING_START() \
+  do { \
+    if (info->accel && info->accel->Sync) \
+	info->accel->Sync(pScrn); \
+  } while (0)
 #define CURSOR_SWAPPING_END()
 
 #endif