nv50: inline nv50_state_flush_notify()

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

diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index a2c56f99a89b9da49312317fe3f8043112acfc19..57b16a355dc1ff0bde3766aeb25ab13b84c08125 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -21,12 +21,12 @@
  */
 
 #include "pipe/p_context.h"
-#include "pipe/p_inlines.h"
+#include "util/u_inlines.h"
 
 #include "nv50_context.h"
 
 struct nv50_query {
-       struct pipe_buffer *buffer;
+       struct nouveau_bo *bo;
        unsigned type;
        boolean ready;
        uint64_t result;
@@ -41,14 +41,16 @@ nv50_query(struct pipe_query *pipe)
 static struct pipe_query *
 nv50_query_create(struct pipe_context *pipe, unsigned type)
 {
-       struct pipe_screen *screen = pipe->winsys;
+       struct nouveau_device *dev = nouveau_screen(pipe->screen)->device;
        struct nv50_query *q = CALLOC_STRUCT(nv50_query);
+       int ret;
 
        assert (q->type == PIPE_QUERY_OCCLUSION_COUNTER);
        q->type = type;
 
-       q->buffer = screen->buffer_create(screen, 256, 0, 16);
-       if (!q->buffer) {
+       ret = nouveau_bo_new(dev, NOUVEAU_BO_GART | NOUVEAU_BO_MAP, 256,
+                            16, &q->bo);
+       if (ret) {
                FREE(q);
                return NULL;
        }
@@ -62,7 +64,7 @@ nv50_query_destroy(struct pipe_context *pipe, struct pipe_query *pq)
        struct nv50_query *q = nv50_query(pq);
 
        if (q) {
-               pipe_buffer_reference(&q->buffer, NULL);
+               nouveau_bo_ref(NULL, &q->bo);
                FREE(q);
        }
 }
@@ -71,13 +73,13 @@ static void
 nv50_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
 {
        struct nv50_context *nv50 = nv50_context(pipe);
-       struct nouveau_channel *chan = nv50->screen->nvws->channel;
+       struct nouveau_channel *chan = nv50->screen->base.channel;
        struct nouveau_grobj *tesla = nv50->screen->tesla;
        struct nv50_query *q = nv50_query(pq);
 
-       BEGIN_RING(chan, tesla, 0x1530, 1);
+       BEGIN_RING(chan, tesla, NV50TCL_SAMPLECNT_RESET, 1);
        OUT_RING  (chan, 1);
-       BEGIN_RING(chan, tesla, 0x1514, 1);
+       BEGIN_RING(chan, tesla, NV50TCL_SAMPLECNT_ENABLE, 1);
        OUT_RING  (chan, 1);
 
        q->ready = FALSE;
@@ -87,43 +89,71 @@ static void
 nv50_query_end(struct pipe_context *pipe, struct pipe_query *pq)
 {
        struct nv50_context *nv50 = nv50_context(pipe);
-       struct nouveau_channel *chan = nv50->screen->nvws->channel;
+       struct nouveau_channel *chan = nv50->screen->base.channel;
        struct nouveau_grobj *tesla = nv50->screen->tesla;
        struct nv50_query *q = nv50_query(pq);
-       struct nouveau_bo *bo = nv50->screen->nvws->get_bo(q->buffer);
 
-       WAIT_RING (chan, 5);
-       BEGIN_RING(chan, tesla, 0x1b00, 4);
-       OUT_RELOCh(chan, bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
-       OUT_RELOCl(chan, bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+       MARK_RING (chan, 5, 2); /* flush on lack of space or relocs */
+       BEGIN_RING(chan, tesla, NV50TCL_QUERY_ADDRESS_HIGH, 4);
+       OUT_RELOCh(chan, q->bo, 0, NOUVEAU_BO_GART | NOUVEAU_BO_WR);
+       OUT_RELOCl(chan, q->bo, 0, NOUVEAU_BO_GART | NOUVEAU_BO_WR);
        OUT_RING  (chan, 0x00000000);
        OUT_RING  (chan, 0x0100f002);
-       FIRE_RING (chan);
+
+       BEGIN_RING(chan, tesla, NV50TCL_SAMPLECNT_ENABLE, 1);
+       OUT_RING  (chan, 0);
 }
 
 static boolean
 nv50_query_result(struct pipe_context *pipe, struct pipe_query *pq,
                  boolean wait, uint64_t *result)
 {
-       struct pipe_winsys *ws = pipe->winsys;
        struct nv50_query *q = nv50_query(pq);
-
-       /*XXX: Want to be able to return FALSE here instead of blocking
-        *     until the result is available..
-        */
+       int ret;
 
        if (!q->ready) {
-               uint32_t *map = ws->buffer_map(ws, q->buffer,
-                                              PIPE_BUFFER_USAGE_CPU_READ);
-               q->result = map[1];
+               ret = nouveau_bo_map(q->bo, NOUVEAU_BO_RD |
+                                    (wait ? 0 : NOUVEAU_BO_NOWAIT));
+               if (ret)
+                       return false;
+               q->result = ((uint32_t *)q->bo->map)[1];
                q->ready = TRUE;
-               ws->buffer_unmap(ws, q->buffer);
+               nouveau_bo_unmap(q->bo);
        }
 
        *result = q->result;
        return q->ready;
 }
 
+static void
+nv50_render_condition(struct pipe_context *pipe,
+                     struct pipe_query *pq, uint mode)
+{
+       struct nv50_context *nv50 = nv50_context(pipe);
+       struct nouveau_channel *chan = nv50->screen->base.channel;
+       struct nouveau_grobj *tesla = nv50->screen->tesla;
+       struct nv50_query *q;
+
+       if (!pq) {
+               BEGIN_RING(chan, tesla, NV50TCL_COND_MODE, 1);
+               OUT_RING  (chan, NV50TCL_COND_MODE_ALWAYS);
+               return;
+       }
+       q = nv50_query(pq);
+
+       if (mode == PIPE_RENDER_COND_WAIT ||
+           mode == PIPE_RENDER_COND_BY_REGION_WAIT) {
+               /* XXX: big fence, FIFO semaphore might be better */
+               BEGIN_RING(chan, tesla, 0x0110, 1);
+               OUT_RING  (chan, 0);
+       }
+
+       BEGIN_RING(chan, tesla, NV50TCL_COND_ADDRESS_HIGH, 3);
+       OUT_RELOCh(chan, q->bo, 0, NOUVEAU_BO_GART | NOUVEAU_BO_RD);
+       OUT_RELOCl(chan, q->bo, 0, NOUVEAU_BO_GART | NOUVEAU_BO_RD);
+       OUT_RING  (chan, NV50TCL_COND_MODE_RES);
+}
+
 void
 nv50_init_query_functions(struct nv50_context *nv50)
 {
@@ -132,4 +162,5 @@ nv50_init_query_functions(struct nv50_context *nv50)
        nv50->pipe.begin_query = nv50_query_begin;
        nv50->pipe.end_query = nv50_query_end;
        nv50->pipe.get_query_result = nv50_query_result;
+       nv50->pipe.render_condition = nv50_render_condition;
 }