X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fnv50%2Fnv50_screen.h;h=b7803cfed80e46ea269663666319f804a199cba5;hb=6d1cdec3ba151168bfc3aef222fba6265dfb41fb;hp=40ebbee72e2e48e795e0de3e983a7d92dd1a7c2c;hpb=c7f5c9a3dc6350252e73b541bb85ab3ed9e64a9c;p=mesa.git

diff --git a/src/gallium/drivers/nv50/nv50_screen.h b/src/gallium/drivers/nv50/nv50_screen.h
index 40ebbee72e2..b7803cfed80 100644
--- a/src/gallium/drivers/nv50/nv50_screen.h
+++ b/src/gallium/drivers/nv50/nv50_screen.h
@@ -2,41 +2,145 @@
 #define __NV50_SCREEN_H__
 
 #include "nouveau/nouveau_screen.h"
+#include "nouveau/nouveau_fence.h"
+#include "nouveau/nouveau_mm.h"
+#include "nouveau/nouveau_heap.h"
+
+#include "nv50_winsys.h"
+#include "nv50_stateobj.h"
+
+#define NV50_TIC_MAX_ENTRIES 2048
+#define NV50_TSC_MAX_ENTRIES 2048
 
 struct nv50_context;
 
+#define NV50_CODE_BO_SIZE_LOG2 19
+
+#define NV50_SCRATCH_SIZE (2 << 20)
+#define NV50_SCRATCH_NR_BUFFERS 2
+
+#define NV50_SCREEN_RESIDENT_BO_COUNT 5
+
+struct nv50_blitctx;
+
 struct nv50_screen {
-	struct nouveau_screen base;
+   struct nouveau_screen base;
 
-	struct nouveau_winsys *nvws;
+   struct nv50_context *cur_ctx;
 
-	struct nv50_context *cur_ctx;
+   struct nouveau_bo *code;
+   struct nouveau_bo *uniforms;
+   struct nouveau_bo *txc; /* TIC (offset 0) and TSC (65536) */
+   struct nouveau_bo *stack_bo;
+   struct nouveau_bo *tls_bo;
 
-	struct nouveau_grobj *tesla;
-	struct nouveau_grobj *eng2d;
-	struct nouveau_grobj *m2mf;
-	struct nouveau_notifier *sync;
+   uint64_t tls_size;
 
-	struct nouveau_bo *constbuf_misc[1];
-	struct nouveau_bo *constbuf_parm[PIPE_SHADER_TYPES];
+   struct nouveau_heap *vp_code_heap;
+   struct nouveau_heap *gp_code_heap;
+   struct nouveau_heap *fp_code_heap;
 
-	struct nouveau_resource *immd_heap[1];
-	struct nouveau_resource *parm_heap[PIPE_SHADER_TYPES];
+   struct nv50_blitctx *blitctx;
 
-	struct pipe_resource *strm_vbuf[16];
+   struct {
+      void **entries;
+      int next;
+      uint32_t lock[NV50_TIC_MAX_ENTRIES / 32];
+   } tic;
+   
+   struct {
+      void **entries;
+      int next;
+      uint32_t lock[NV50_TSC_MAX_ENTRIES / 32];
+   } tsc;
 
-	struct nouveau_bo *tic;
-	struct nouveau_bo *tsc;
+   struct {
+      uint32_t *map;
+      struct nouveau_bo *bo;
+   } fence;
 
-	boolean force_push;
+   struct nouveau_object *sync;
+
+   struct nouveau_object *tesla;
+   struct nouveau_object *eng2d;
+   struct nouveau_object *m2mf;
 };
 
 static INLINE struct nv50_screen *
 nv50_screen(struct pipe_screen *screen)
 {
-	return (struct nv50_screen *)screen;
+   return (struct nv50_screen *)screen;
+}
+
+boolean nv50_blitctx_create(struct nv50_screen *);
+
+int nv50_screen_tic_alloc(struct nv50_screen *, void *);
+int nv50_screen_tsc_alloc(struct nv50_screen *, void *);
+
+static INLINE void
+nv50_resource_fence(struct nv04_resource *res, uint32_t flags)
+{
+   struct nv50_screen *screen = nv50_screen(res->base.screen);
+
+   if (res->mm) {
+      nouveau_fence_ref(screen->base.fence.current, &res->fence);
+      if (flags & NOUVEAU_BO_WR)
+         nouveau_fence_ref(screen->base.fence.current, &res->fence_wr);
+   }
 }
 
-extern void nv50_screen_relocs(struct nv50_screen *);
+static INLINE void
+nv50_resource_validate(struct nv04_resource *res, uint32_t flags)
+{
+   if (likely(res->bo)) {
+      if (flags & NOUVEAU_BO_WR)
+         res->status |= NOUVEAU_BUFFER_STATUS_GPU_WRITING;
+      if (flags & NOUVEAU_BO_RD)
+         res->status |= NOUVEAU_BUFFER_STATUS_GPU_READING;
+
+      nv50_resource_fence(res, flags);
+   }
+}
+
+struct nv50_format {
+   uint32_t rt;
+   uint32_t tic;
+   uint32_t vtx;
+   uint32_t usage;
+};
+
+extern const struct nv50_format nv50_format_table[];
+
+static INLINE void
+nv50_screen_tic_unlock(struct nv50_screen *screen, struct nv50_tic_entry *tic)
+{
+   if (tic->id >= 0)
+      screen->tic.lock[tic->id / 32] &= ~(1 << (tic->id % 32));
+}
+
+static INLINE void
+nv50_screen_tsc_unlock(struct nv50_screen *screen, struct nv50_tsc_entry *tsc)
+{
+   if (tsc->id >= 0)
+      screen->tsc.lock[tsc->id / 32] &= ~(1 << (tsc->id % 32));
+}
+
+static INLINE void
+nv50_screen_tic_free(struct nv50_screen *screen, struct nv50_tic_entry *tic)
+{
+   if (tic->id >= 0) {
+      screen->tic.entries[tic->id] = NULL;
+      screen->tic.lock[tic->id / 32] &= ~(1 << (tic->id % 32));
+   }
+}
+
+static INLINE void
+nv50_screen_tsc_free(struct nv50_screen *screen, struct nv50_tsc_entry *tsc)
+{
+   if (tsc->id >= 0) {
+      screen->tsc.entries[tsc->id] = NULL;
+      screen->tsc.lock[tsc->id / 32] &= ~(1 << (tsc->id % 32));
+   }
+}
 
 #endif