--- src/radeon_accelfuncs.c.orig	2007-03-30 23:22:45.000000000 -0700
+++ src/radeon_accelfuncs.c	2007-08-04 15:35:29.000000000 -0700
@@ -100,30 +100,9 @@
 static void
 FUNC_NAME(RADEONRestoreAccelState)(ScrnInfoPtr pScrn)
 {
-    /*RADEONInfoPtr  info       = RADEONPTR(pScrn);
-    unsigned char *RADEONMMIO = info->MMIO;*/
-
-#ifdef ACCEL_MMIO
-
-/*    OUTREG(RADEON_DEFAULT_OFFSET, info->dst_pitch_offset);*/
     /* FIXME: May need to restore other things, like BKGD_CLK FG_CLK... */
 
-    RADEONWaitForIdleMMIO(pScrn);
-
-#else /* ACCEL_CP */
-
-/*    RADEONWaitForFifo(pScrn, 1);
-    OUTREG(RADEON_DEFAULT_OFFSET, info->frontPitchOffset);*/
-
-    RADEONWaitForIdleMMIO(pScrn);
-
-#if 0
-    /* Not working yet */
-    RADEONMMIO_TO_CP(pScrn, info);
-#endif
-
-    /* FIXME: May need to restore other things, like BKGD_CLK FG_CLK... */
-#endif
+    FUNC_NAME(RADEONWaitForIdle)(pScrn);
 }
 
 /* Setup for XAA SolidFill */