Merge branch 'mesa_7_6_branch'

[mesa.git] / src / gallium / drivers / nv50 / nv50_context.c

diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index e02afc4be9901c48b36ab5aaab9f7877174624d2..fca078b174a4f1d3178bee90e9869a21214ffcb3 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -31,15 +31,24 @@ 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, 2);
+       BEGIN_RING(chan, eng2d, 0x0110, 1);
+       OUT_RING  (chan, 0);
+
+       if (flags & PIPE_FLUSH_FRAME)
+               FIRE_RING(chan);
 }
 
 static void
 nv50_destroy(struct pipe_context *pipe)
 {
-       struct nv50_context *nv50 = (struct nv50_context *)pipe;
+       struct nv50_context *nv50 = nv50_context(pipe);
 
        draw_destroy(nv50->draw);
        FREE(nv50);
@@ -102,6 +111,9 @@ nv50_create(struct pipe_screen *pscreen, unsigned pctx_id)
        nv50->pipe.is_texture_referenced = nv50_is_texture_referenced;
        nv50->pipe.is_buffer_referenced = nv50_is_buffer_referenced;
 
+       screen->base.channel->user_private = nv50;
+       screen->base.channel->flush_notify = nv50_state_flush_notify;
+
        nv50_init_surface_functions(nv50);
        nv50_init_state_functions(nv50);
        nv50_init_query_functions(nv50);
@@ -112,5 +124,3 @@ nv50_create(struct pipe_screen *pscreen, unsigned pctx_id)
 
        return &nv50->pipe;
 }
-
-