[Nouveau] [PATCH] nv50/exa: wait for enough space for at least one composite operation

Marcin Slusarz marcin.slusarz at gmail.com
Sun Nov 6 11:32:09 PST 2011


---
 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);
-- 
1.7.7



More information about the Nouveau mailing list