nouveau: wait for sync after m2mf also, to be thourough.

These will all go away at some point I promise, want to rule out sync issues
while I bash nv40 into shape.

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nv04_region.c b/src/mesa/drivers/dri/nouveau_winsys/nv04_region.c
index 1160a8f340d1d793f7827e0c8772960b6a71a2b4..0fdb38e105c694650c5f3cc46bfb4fec5babf7ea 100644 (file)
--- a/src/mesa/drivers/dri/nouveau_winsys/nv04_region.c
+++ b/src/mesa/drivers/dri/nouveau_winsys/nv04_region.c
@@ -64,6 +64,14 @@ nv04_region_copy_m2mf(struct nouveau_context *nv, struct pipe_region *dst,
                dst_offset += dst->pitch * count;
        }
 
+       nouveau_notifier_reset(nv->sync_notifier, 0);
+       BEGIN_RING(NvM2MF, 0x104, 1);
+       OUT_RING  (0);
+       BEGIN_RING(NvM2MF, 0x100, 1);
+       OUT_RING  (0);
+       FIRE_RING();
+       nouveau_notifier_wait_status(nv->sync_notifier, 0, 0, 2000);
+
        return 0;
 }