diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 70770b1..174cc13 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -2098,6 +2106,11 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
     OUT_ACCEL_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_3D_IDLECLEAN);
     FINISH_ACCEL();
 
+#ifdef ACCEL_CP
+    FLUSH_RING();
+#endif
+    RADEONWaitForIdleMMIO(pScrn);
+
     LEAVE_DRAW(0);
 }