X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fnv50%2Fnv50_context.c;h=88eb4bb246caa6432fd9632edab47d93c446eb8b;hb=6d1cdec3ba151168bfc3aef222fba6265dfb41fb;hp=aa14e17872df2ff1b4df07b3ace7a3d7bf2ef059;hpb=b43c182f19c6291c88420fa12714f952c2b461fb;p=mesa.git

diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index aa14e17872d..88eb4bb246c 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Skeggs
+ * Copyright 2010 Christoph Bumiller
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,83 +25,178 @@
 
 #include "nv50_context.h"
 #include "nv50_screen.h"
+#include "nv50_resource.h"
+
+#include "nouveau/nouveau_reloc.h"
 
 static void
-nv50_flush(struct pipe_context *pipe, unsigned flags,
-	   struct pipe_fence_handle **fence)
+nv50_flush(struct pipe_context *pipe,
+           struct pipe_fence_handle **fence)
 {
-	struct nv50_context *nv50 = nv50_context(pipe);
-	struct nouveau_channel *chan = nv50->screen->base.channel;
+   struct nouveau_screen *screen = nouveau_screen(pipe->screen);
 
-	if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
-		BEGIN_RING(chan, nv50->screen->tesla, 0x1338, 1);
-		OUT_RING  (chan, 0x20);
-	}
+   if (fence)
+      nouveau_fence_ref(screen->fence.current, (struct nouveau_fence **)fence);
 
-	if (flags & PIPE_FLUSH_FRAME)
-		FIRE_RING(chan);
+   PUSH_KICK(screen->pushbuf);
 }
 
 static void
-nv50_destroy(struct pipe_context *pipe)
+nv50_texture_barrier(struct pipe_context *pipe)
 {
-	struct nv50_context *nv50 = nv50_context(pipe);
-	int i;
+   struct nouveau_pushbuf *push = nv50_context(pipe)->base.pushbuf;
+
+   BEGIN_NV04(push, SUBC_3D(NV50_GRAPH_SERIALIZE), 1);
+   PUSH_DATA (push, 0);
+   BEGIN_NV04(push, NV50_3D(TEX_CACHE_CTL), 1);
+   PUSH_DATA (push, 0x20);
+}
 
-	for (i = 0; i < 64; i++) {
-		if (!nv50->state.hw[i])
-			continue;
-		so_ref(NULL, &nv50->state.hw[i]);
-	}
+void
+nv50_default_kick_notify(struct nouveau_pushbuf *push)
+{
+   struct nv50_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;
+   }
+}
 
-	draw_destroy(nv50->draw);
+static void
+nv50_context_unreference_resources(struct nv50_context *nv50)
+{
+   unsigned s, i;
 
-	if (nv50->screen->cur_ctx == nv50)
-		nv50->screen->cur_ctx = NULL;
+   nouveau_bufctx_del(&nv50->bufctx_3d);
+   nouveau_bufctx_del(&nv50->bufctx);
 
-	FREE(nv50);
+   for (i = 0; i < nv50->num_vtxbufs; ++i)
+      pipe_resource_reference(&nv50->vtxbuf[i].buffer, NULL);
+
+   pipe_resource_reference(&nv50->idxbuf.buffer, NULL);
+
+   for (s = 0; s < 3; ++s) {
+      for (i = 0; i < nv50->num_textures[s]; ++i)
+         pipe_sampler_view_reference(&nv50->textures[s][i], NULL);
+
+      for (i = 0; i < 16; ++i)
+         pipe_resource_reference(&nv50->constbuf[s][i], NULL);
+   }
 }
 
+static void
+nv50_destroy(struct pipe_context *pipe)
+{
+   struct nv50_context *nv50 = nv50_context(pipe);
+
+   if (nv50_context_screen(nv50)->cur_ctx == nv50) {
+      nv50->base.pushbuf->kick_notify = NULL;
+      nv50_context_screen(nv50)->cur_ctx = NULL;
+      nouveau_pushbuf_bufctx(nv50->base.pushbuf, NULL);
+   }
+   /* need to flush before destroying the bufctx */
+   nouveau_pushbuf_kick(nv50->base.pushbuf, nv50->base.pushbuf->channel);
+
+   nv50_context_unreference_resources(nv50);
+
+   draw_destroy(nv50->draw);
+
+   FREE(nv50);
+}
 
 struct pipe_context *
 nv50_create(struct pipe_screen *pscreen, void *priv)
 {
-	struct pipe_winsys *pipe_winsys = pscreen->winsys;
-	struct nv50_screen *screen = nv50_screen(pscreen);
-	struct nv50_context *nv50;
+   struct nv50_screen *screen = nv50_screen(pscreen);
+   struct nv50_context *nv50;
+   struct pipe_context *pipe;
+   int ret;
+   uint32_t flags;
+
+   nv50 = CALLOC_STRUCT(nv50_context);
+   if (!nv50)
+      return NULL;
+   pipe = &nv50->base.pipe;
+
+   nv50->base.pushbuf = screen->base.pushbuf;
+
+   ret = nouveau_bufctx_new(screen->base.client, NV50_BIND_COUNT,
+                            &nv50->bufctx_3d);
+   if (!ret)
+      ret = nouveau_bufctx_new(screen->base.client, 2, &nv50->bufctx);
+   if (ret)
+      goto out_err;
+
+   nv50->base.screen    = &screen->base;
+   nv50->base.copy_data = nv50_m2mf_copy_linear;
+   nv50->base.push_data = nv50_sifc_linear_u8;
 
-	nv50 = CALLOC_STRUCT(nv50_context);
-	if (!nv50)
-		return NULL;
-	nv50->screen = screen;
+   nv50->screen = screen;
+   pipe->screen = pscreen;
+   pipe->priv = priv;
 
-	nv50->pipe.winsys = pipe_winsys;
-	nv50->pipe.screen = pscreen;
-	nv50->pipe.priv = priv;
+   pipe->destroy = nv50_destroy;
 
-	nv50->pipe.destroy = nv50_destroy;
+   pipe->draw_vbo = nv50_draw_vbo;
+   pipe->clear = nv50_clear;
 
-	nv50->pipe.draw_arrays = nv50_draw_arrays;
-	nv50->pipe.draw_arrays_instanced = nv50_draw_arrays_instanced;
-	nv50->pipe.draw_elements = nv50_draw_elements;
-	nv50->pipe.draw_elements_instanced = nv50_draw_elements_instanced;
-	nv50->pipe.clear = nv50_clear;
+   pipe->flush = nv50_flush;
+   pipe->texture_barrier = nv50_texture_barrier;
 
-	nv50->pipe.flush = nv50_flush;
+   if (!screen->cur_ctx) {
+      screen->cur_ctx = nv50;
+      nouveau_pushbuf_bufctx(screen->base.pushbuf, nv50->bufctx);
+   }
 
-	nv50->pipe.is_texture_referenced = nouveau_is_texture_referenced;
-	nv50->pipe.is_buffer_referenced = nouveau_is_buffer_referenced;
+   nv50_init_query_functions(nv50);
+   nv50_init_surface_functions(nv50);
+   nv50_init_state_functions(nv50);
+   nv50_init_resource_functions(pipe);
 
-	screen->base.channel->user_private = nv50;
+   nv50->draw = draw_create(pipe);
+   assert(nv50->draw);
+   draw_set_rasterize_stage(nv50->draw, nv50_draw_render_stage(nv50));
 
-	nv50_init_surface_functions(nv50);
-	nv50_init_state_functions(nv50);
-	nv50_init_query_functions(nv50);
-        nv50_init_transfer_functions(nv50);
+   nouveau_context_init_vdec(&nv50->base);
 
-	nv50->draw = draw_create();
-	assert(nv50->draw);
-	draw_set_rasterize_stage(nv50->draw, nv50_draw_render_stage(nv50));
+   flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_RD;
 
-	return &nv50->pipe;
+   BCTX_REFN_bo(nv50->bufctx_3d, SCREEN, flags, screen->code);
+   BCTX_REFN_bo(nv50->bufctx_3d, SCREEN, flags, screen->uniforms);
+   BCTX_REFN_bo(nv50->bufctx_3d, SCREEN, flags, screen->txc);
+   BCTX_REFN_bo(nv50->bufctx_3d, SCREEN, flags, screen->stack_bo);
+
+   flags = NOUVEAU_BO_GART | NOUVEAU_BO_WR;
+
+   BCTX_REFN_bo(nv50->bufctx_3d, SCREEN, flags, screen->fence.bo);
+   BCTX_REFN_bo(nv50->bufctx, FENCE, flags, screen->fence.bo);
+
+   return pipe;
+
+out_err:
+   if (nv50) {
+      if (nv50->bufctx_3d)
+         nouveau_bufctx_del(&nv50->bufctx_3d);
+      if (nv50->bufctx)
+         nouveau_bufctx_del(&nv50->bufctx);
+      FREE(nv50);
+   }
+   return NULL;
+}
+
+void
+nv50_bufctx_fence(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)
+         nv50_resource_validate(res, (unsigned)ref->priv_data);
+   }
 }