summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-11-21 19:21:34 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-11-21 19:21:34 +1100
commitdd1500b8b436dc4a009455489ade7dcf65f03d07 (patch)
treee7cee5dbf6e1f60b233dd51efb183b1e8ce797f3
parentff7edad0776603aa62b8f684db20c84bde75ea0b (diff)
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.
-rw-r--r--src/mesa/drivers/dri/nouveau_winsys/nv04_region.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nv04_region.c b/src/mesa/drivers/dri/nouveau_winsys/nv04_region.c
index 1160a8f340..0fdb38e105 100644
--- 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;
}