diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index eb35014e..faf4d5d0 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -722,6 +722,14 @@ i830_uxa_init (ScreenPtr pScreen)
  	i830->uxa_driver->done_composite = i830_done_composite;
     }
 
+    /* FIXME */
+    if (IS_IGDNG(i830)) {
+	i830->uxa_driver->check_composite = NULL;
+	i830->uxa_driver->prepare_composite = NULL;
+	i830->uxa_driver->composite = NULL;
+	i830->uxa_driver->done_composite = NULL;
+    }
+
     i830->uxa_driver->prepare_access = i830_uxa_prepare_access;
     i830->uxa_driver->finish_access = i830_uxa_finish_access;
     i830->uxa_driver->pixmap_is_offscreen = i830_uxa_pixmap_is_offscreen;