X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fnvc0%2Fnvc0_context.c;h=6325ac859f4cfe19ebf2a4784f0f4c536727b587;hb=598cc1f74d7ae924e84dee801b456ab7b0b22f84;hp=b2b4fd62eeb5dbf7846edd369afbee5ba3456da6;hpb=72e30991559017c16d48569e612dbc0970e3b9ca;p=mesa.git

diff --git a/src/gallium/drivers/nvc0/nvc0_context.c b/src/gallium/drivers/nvc0/nvc0_context.c
index b2b4fd62eeb..6325ac859f4 100644
--- a/src/gallium/drivers/nvc0/nvc0_context.c
+++ b/src/gallium/drivers/nvc0/nvc0_context.c
@@ -20,38 +20,66 @@
  * SOFTWARE.
  */
 
-#include "draw/draw_context.h"
 #include "pipe/p_defines.h"
+#include "util/u_framebuffer.h"
+
+#ifdef NVC0_WITH_DRAW_MODULE
+#include "draw/draw_context.h"
+#endif
 
 #include "nvc0_context.h"
 #include "nvc0_screen.h"
 #include "nvc0_resource.h"
 
-#include "nouveau/nouveau_reloc.h"
-
 static void
-nvc0_flush(struct pipe_context *pipe, unsigned flags,
-           struct pipe_fence_handle **fence)
+nvc0_flush(struct pipe_context *pipe,
+           struct pipe_fence_handle **fence,
+           enum pipe_flush_flags flags)
 {
    struct nvc0_context *nvc0 = nvc0_context(pipe);
-   struct nouveau_channel *chan = nvc0->screen->base.channel;
+   struct nouveau_screen *screen = &nvc0->screen->base;
 
-   if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
-      BEGIN_RING(chan, RING_3D(SERIALIZE), 1);
-      OUT_RING  (chan, 0);
-      BEGIN_RING(chan, RING_3D(TEX_CACHE_CTL), 1);
-      OUT_RING  (chan, 0x00);
-   }
+   if (fence)
+      nouveau_fence_ref(screen->fence.current, (struct nouveau_fence **)fence);
 
-   if (fence) {
-      nvc0_screen_fence_new(nvc0->screen, (struct nvc0_fence **)fence, TRUE);
-   }
+   PUSH_KICK(nvc0->base.pushbuf); /* fencing handled in kick_notify */
+}
+
+static void
+nvc0_texture_barrier(struct pipe_context *pipe)
+{
+   struct nouveau_pushbuf *push = nvc0_context(pipe)->base.pushbuf;
+
+   IMMED_NVC0(push, NVC0_3D(SERIALIZE), 0);
+   IMMED_NVC0(push, NVC0_3D(TEX_CACHE_CTL), 0);
+}
+
+static void
+nvc0_context_unreference_resources(struct nvc0_context *nvc0)
+{
+   unsigned s, i;
+
+   nouveau_bufctx_del(&nvc0->bufctx_3d);
+   nouveau_bufctx_del(&nvc0->bufctx);
+
+   util_unreference_framebuffer_state(&nvc0->framebuffer);
 
-   if (flags & (PIPE_FLUSH_SWAPBUFFERS | PIPE_FLUSH_FRAME)) {
-      FIRE_RING(chan);
+   for (i = 0; i < nvc0->num_vtxbufs; ++i)
+      pipe_resource_reference(&nvc0->vtxbuf[i].buffer, NULL);
 
-      nvc0_screen_fence_next(nvc0->screen);
+   pipe_resource_reference(&nvc0->idxbuf.buffer, NULL);
+
+   for (s = 0; s < 5; ++s) {
+      for (i = 0; i < nvc0->num_textures[s]; ++i)
+         pipe_sampler_view_reference(&nvc0->textures[s][i], NULL);
+
+      for (i = 0; i < NVC0_MAX_PIPE_CONSTBUFS; ++i)
+         if (!nvc0->constbuf[s][i].user)
+            pipe_resource_reference(&nvc0->constbuf[s][i].u.buf, NULL);
    }
+
+   for (i = 0; i < nvc0->num_tfbbufs; ++i)
+      pipe_so_target_reference(&nvc0->tfbbuf[i], NULL);
 }
 
 static void
@@ -59,105 +87,143 @@ nvc0_destroy(struct pipe_context *pipe)
 {
    struct nvc0_context *nvc0 = nvc0_context(pipe);
 
+   if (nvc0->screen->cur_ctx == nvc0) {
+      nvc0->base.pushbuf->kick_notify = NULL;
+      nvc0->screen->cur_ctx = NULL;
+      nouveau_pushbuf_bufctx(nvc0->base.pushbuf, NULL);
+   }
+   nouveau_pushbuf_kick(nvc0->base.pushbuf, nvc0->base.pushbuf->channel);
+
+   nvc0_context_unreference_resources(nvc0);
+
+#ifdef NVC0_WITH_DRAW_MODULE
    draw_destroy(nvc0->draw);
+#endif
 
-   if (nvc0->screen->cur_ctx == nvc0)
-      nvc0->screen->cur_ctx = NULL;
+   nouveau_context_destroy(&nvc0->base);
+}
 
-   FREE(nvc0);
+void
+nvc0_default_kick_notify(struct nouveau_pushbuf *push)
+{
+   struct nvc0_screen *screen = push->user_priv;
+
+   if (screen) {
+      nouveau_fence_next(&screen->base);
+      nouveau_fence_update(&screen->base, TRUE);
+      if (screen->cur_ctx)
+         screen->cur_ctx->state.flushed = TRUE;
+   }
 }
 
 struct pipe_context *
 nvc0_create(struct pipe_screen *pscreen, void *priv)
 {
-   struct pipe_winsys *pipe_winsys = pscreen->winsys;
    struct nvc0_screen *screen = nvc0_screen(pscreen);
    struct nvc0_context *nvc0;
+   struct pipe_context *pipe;
+   int ret;
+   uint32_t flags;
 
    nvc0 = CALLOC_STRUCT(nvc0_context);
    if (!nvc0)
       return NULL;
+   pipe = &nvc0->base.pipe;
+
+   if (!nvc0_blitctx_create(nvc0))
+      goto out_err;
+
+   nvc0->base.pushbuf = screen->base.pushbuf;
+
+   ret = nouveau_bufctx_new(screen->base.client, NVC0_BIND_COUNT,
+                            &nvc0->bufctx_3d);
+   if (!ret)
+      nouveau_bufctx_new(screen->base.client, 2, &nvc0->bufctx);
+   if (ret)
+      goto out_err;
+
    nvc0->screen = screen;
+   nvc0->base.screen = &screen->base;
 
-   nvc0->pipe.winsys = pipe_winsys;
-   nvc0->pipe.screen = pscreen;
-   nvc0->pipe.priv = priv;
+   pipe->screen = pscreen;
+   pipe->priv = priv;
 
-   nvc0->pipe.destroy = nvc0_destroy;
+   pipe->destroy = nvc0_destroy;
 
-   nvc0->pipe.draw_vbo = nvc0_draw_vbo;
-   nvc0->pipe.clear = nvc0_clear;
+   pipe->draw_vbo = nvc0_draw_vbo;
+   pipe->clear = nvc0_clear;
 
-   nvc0->pipe.flush = nvc0_flush;
+   pipe->flush = nvc0_flush;
+   pipe->texture_barrier = nvc0_texture_barrier;
 
-   screen->base.channel->user_private = nvc0;
+   if (!screen->cur_ctx) {
+      screen->cur_ctx = nvc0;
+      nouveau_pushbuf_bufctx(screen->base.pushbuf, nvc0->bufctx);
+   }
+   screen->base.pushbuf->kick_notify = nvc0_default_kick_notify;
 
+   nvc0_init_query_functions(nvc0);
    nvc0_init_surface_functions(nvc0);
    nvc0_init_state_functions(nvc0);
-   nvc0_init_resource_functions(&nvc0->pipe);
+   nvc0_init_transfer_functions(nvc0);
+   nvc0_init_resource_functions(pipe);
 
-   nvc0->draw = draw_create(&nvc0->pipe);
+#ifdef NVC0_WITH_DRAW_MODULE
+   /* no software fallbacks implemented */
+   nvc0->draw = draw_create(pipe);
    assert(nvc0->draw);
    draw_set_rasterize_stage(nvc0->draw, nvc0_draw_render_stage(nvc0));
+#endif
 
-   return &nvc0->pipe;
-}
+   nouveau_context_init_vdec(&nvc0->base);
 
-struct resident {
-   struct nvc0_resource *res;
-   uint32_t flags;
-};
+   /* shader builtin library is per-screen, but we need a context for m2mf */
+   nvc0_program_library_upload(nvc0);
 
-void
-nvc0_bufctx_add_resident(struct nvc0_context *nvc0, int ctx,
-                         struct nvc0_resource *resource, uint32_t flags)
-{
-   struct resident rsd = { resource, flags };
+   /* add permanently resident buffers to bufctxts */
 
-   if (!resource->bo)
-      return;
+   flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_RD;
 
-   /* We don't need to reference the resource here, it will be referenced
-    * in the context/state, and bufctx will be reset when state changes.
-    */
-   util_dynarray_append(&nvc0->residents[ctx], struct resident, rsd);
-}
+   BCTX_REFN_bo(nvc0->bufctx_3d, SCREEN, flags, screen->text);
+   BCTX_REFN_bo(nvc0->bufctx_3d, SCREEN, flags, screen->uniform_bo);
+   BCTX_REFN_bo(nvc0->bufctx_3d, SCREEN, flags, screen->txc);
+   BCTX_REFN_bo(nvc0->bufctx_3d, SCREEN, flags, screen->poly_cache);
 
-void
-nvc0_bufctx_del_resident(struct nvc0_context *nvc0, int ctx,
-                         struct nvc0_resource *resource)
-{
-   struct resident *rsd, *top;
-   unsigned i;
-
-   for (i = 0; i < nvc0->residents[ctx].size / sizeof(struct resident); ++i) {
-      rsd = util_dynarray_element(&nvc0->residents[ctx], struct resident, i);
-
-      if (rsd->res == resource) {
-         top = util_dynarray_pop_ptr(&nvc0->residents[ctx], struct resident);
-         if (rsd != top)
-            *rsd = *top;
-         break;
-      }
-   }
-}
+   flags = NOUVEAU_BO_GART | NOUVEAU_BO_WR;
 
-void
-nvc0_bufctx_emit_relocs(struct nvc0_context *nvc0)
-{
-   struct resident *rsd;
-   struct util_dynarray *array;
-   unsigned ctx, i;
+   BCTX_REFN_bo(nvc0->bufctx_3d, SCREEN, flags, screen->fence.bo);
+   BCTX_REFN_bo(nvc0->bufctx, FENCE, flags, screen->fence.bo);
+
+   nvc0->base.scratch.bo_size = 2 << 20;
 
-   for (ctx = 0; ctx < NVC0_BUFCTX_COUNT; ++ctx) {
-      array = &nvc0->residents[ctx];
+   memset(nvc0->tex_handles, ~0, sizeof(nvc0->tex_handles));
 
-      for (i = 0; i < array->size / sizeof(struct resident); ++i) {
-         rsd = util_dynarray_element(array, struct resident, i);
+   return pipe;
 
-         nvc0_resource_validate(rsd->res, rsd->flags);
-      }
+out_err:
+   if (nvc0) {
+      if (nvc0->bufctx_3d)
+         nouveau_bufctx_del(&nvc0->bufctx_3d);
+      if (nvc0->bufctx)
+         nouveau_bufctx_del(&nvc0->bufctx);
+      if (nvc0->blit)
+         FREE(nvc0->blit);
+      FREE(nvc0);
    }
+   return NULL;
+}
 
-   nvc0_screen_make_buffers_resident(nvc0->screen);
+void
+nvc0_bufctx_fence(struct nvc0_context *nvc0, struct nouveau_bufctx *bufctx,
+                  boolean on_flush)
+{
+   struct nouveau_list *list = on_flush ? &bufctx->current : &bufctx->pending;
+   struct nouveau_list *it;
+
+   for (it = list->next; it != list; it = it->next) {
+      struct nouveau_bufref *ref = (struct nouveau_bufref *)it;
+      struct nv04_resource *res = ref->priv;
+      if (res)
+         nvc0_resource_validate(res, (unsigned)ref->priv_data);
+   }
 }