diff -Nurp xserver-xorg-video-intel-2.2.1-patched/src/i830_exa.c xserver-xorg-video-intel-2.2.1-working/src/i830_exa.c
--- xserver-xorg-video-intel-2.2.1-patched/src/i830_exa.c	2008-03-18 18:53:09.000000000 -0700
+++ xserver-xorg-video-intel-2.2.1-working/src/i830_exa.c	2008-03-18 18:52:26.000000000 -0700
@@ -548,6 +548,13 @@ I830EXAInit(ScreenPtr pScreen)
 	pI830->EXADriverPtr->maxY = 2048;
     }
 
+#if defined(EXA_MIGRATION_GREEDY)
+    /* Force use of Option "MigrationHeuristic" "greedy" here for all hardware with EXA (LP: #177492) */
+    pI830->EXADriverPtr->flags |= EXA_MIGRATION_GREEDY;
+    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+               "EXA greedy migration mode enabled.\n");
+#endif
+
     /* Sync */
     pI830->EXADriverPtr->WaitMarker = I830EXASync;