diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2011-11-06 20:32:09 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-11-10 09:13:09 +1000 |
| commit | 5aa30ae6554c957609929ef29d1b27c89e9a7f06 (patch) | |
| tree | d5b1f2e80b892ee2c2fef2dbce38aef502d67f30 | |
| parent | 3d54426c4833a7e058e50624452f89139921e64b (diff) | |
| download | xorg-driver-xf86-video-nouveau-5aa30ae6554c957609929ef29d1b27c89e9a7f06.tar.gz | |
nv50/exa: wait for enough space for at least one composite operation
| -rw-r--r-- | src/nv50_exa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nv50_exa.c b/src/nv50_exa.c index b6094ae..6f753f2 100644 --- a/src/nv50_exa.c +++ b/src/nv50_exa.c @@ -838,7 +838,7 @@ NV50EXAPrepareComposite(int op, NV50EXA_LOCALS(pspix); const unsigned shd_flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_RD; - if (MARK_RING (chan, 128, 4 + 2 + 2 * 10)) + if (MARK_RING (chan, 144, 4 + 2 + 2 * 10)) NOUVEAU_FALLBACK("ring space\n"); BEGIN_RING(chan, eng2d, 0x0110, 1); @@ -949,7 +949,7 @@ NV50EXAComposite(PixmapPtr pdpix, int sx, int sy, int mx, int my, NV50EXA_LOCALS(pdpix); float sX0, sX1, sX2, sY0, sY1, sY2; - WAIT_RING (chan, 64); + WAIT_RING (chan, 28); BEGIN_RING(chan, tesla, NV50TCL_SCISSOR_HORIZ(0), 2); OUT_RING (chan, (dx + w) << 16 | dx); OUT_RING (chan, (dy + h) << 16 | dy); |