diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index f461f3c..6a728d2 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -419,8 +419,9 @@ Bool RADEONSetupMemEXA (ScreenPtr pScreen)
 	    xf86CrtcPtr crtc = xf86_config->crtc[c];
 	    RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
 
-	    radeon_crtc->cursor_offset = info->exa->offScreenBase;
-	    info->exa->offScreenBase += cursor_size;
+	    radeon_crtc->cursor_offset =
+		RADEON_ALIGN(info->exa->offScreenBase, IS_AVIVO_VARIANT ? 4096 : 256);
+	    info->exa->offScreenBase = radeon_crtc->cursor_offset + cursor_size;
 
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		       "Will use %d kb for hardware cursor %d at offset 0x%08x\n",