From: Maarten Maathuis <madman2003@gmail.com>
Date: Sun, 16 Aug 2009 02:06:44 +0000 (+0200)
Subject: nv50: borrow some flushing code from the ddx
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97cc526eb7ae17c6ec3509a129863ea85f4e8900;p=mesa.git

nv50: borrow some flushing code from the ddx

- This fixes neverball corruption.
- I'm unsure about what we're actually flushing here.
---

diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index a2222d88b93..48f36d6a8b5 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -31,9 +31,17 @@ static void
 nv50_flush(struct pipe_context *pipe, unsigned flags,
 	   struct pipe_fence_handle **fence)
 {
-	struct nv50_context *nv50 = (struct nv50_context *)pipe;
-	
-	FIRE_RING(nv50->screen->base.channel);
+	struct nv50_context *nv50 = nv50_context(pipe);
+	struct nouveau_channel *chan = nv50->screen->base.channel;
+	struct nouveau_grobj *eng2d = nv50->screen->eng2d;
+
+	/* We need this in the ddx for reliable composite, not sure what we're
+	 * actually flushing. We generate all our own flushes with flags = 0. */
+	WAIT_RING(chan, 3);
+	BEGIN_RING(chan, eng2d, 0x0110, 1);
+	OUT_RING  (chan, 0);
+
+	FIRE_RING(chan);
 }
 
 static void