diff --git a/src/i830_memory.c b/src/i830_memory.c
index d97ca0b9..06c21acd 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1946,7 +1946,8 @@ i830_bind_all_memory(ScrnInfoPtr pScrn)
 	}
 #endif
     }
-    i830_update_cursor_offsets(pScrn);
+    if (!pI830->SWCursor)
+	i830_update_cursor_offsets(pScrn);
 
     return TRUE;
 }