diff options
| author | Maarten Maathuis <madman2003@gmail.com> | 2009-12-04 22:58:22 +0100 |
|---|---|---|
| committer | Maarten Maathuis <madman2003@gmail.com> | 2009-12-14 19:31:54 +0100 |
| commit | 41b52aa3362665e08bdc2f75cc9bfdc4debc6eb0 (patch) | |
| tree | 9de6cd29f35f46afc937ddf8bd71cd3fce415ca9 /src/gallium/drivers/nv50/nv50_transfer.c | |
| parent | 2677f199a547f6e44d964b8c34dd7f60d9523ab2 (diff) | |
nouveau: avoid running out of relocs
- Added flush notify functions for NV30 and NV40.
- Flushing mid frame will call flush notify, which will resubmit all
relocs.
- We don't try to recover from reloc failure yet.
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_transfer.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_transfer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/nv50_transfer.c b/src/gallium/drivers/nv50/nv50_transfer.c index 104d29a003..6240a0c757 100644 --- a/src/gallium/drivers/nv50/nv50_transfer.c +++ b/src/gallium/drivers/nv50/nv50_transfer.c @@ -82,7 +82,7 @@ nv50_transfer_rect_m2mf(struct pipe_screen *pscreen, while (height) { int line_count = height > 2047 ? 2047 : height; - WAIT_RING (chan, 15); + MARK_RING (chan, 15, 4); /* flush on lack of space or relocs */ BEGIN_RING(chan, m2mf, NV50_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN_HIGH, 2); OUT_RELOCh(chan, src_bo, src_offset, src_reloc); @@ -265,7 +265,7 @@ nv50_upload_sifc(struct nv50_context *nv50, reloc |= NOUVEAU_BO_WR; - WAIT_RING (chan, 32); + MARK_RING (chan, 32, 2); /* flush on lack of space or relocs */ if (bo->tile_flags) { BEGIN_RING(chan, eng2d, NV50_2D_DST_FORMAT, 5); |