nouveau: ensure vbo_dirty is set when buffer write transfer complete

This introduces a shared nouveau_context struct to track such things.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

11 files changed, 102 insertions, 94 deletions

diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index 03a5c3d2d9..912367b839 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -84,22 +84,28 @@ 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 pipe_context *pipe;
 
    nv50 = CALLOC_STRUCT(nv50_context);
    if (!nv50)
       return NULL;
+   pipe = &nv50->base.pipe;
+
    nv50->screen = screen;
+   nv50->base.screen    = &screen->base;
+   nv50->base.copy_data = nv50_m2mf_copy_linear;
+   nv50->base.push_data = nv50_sifc_linear_u8;
 
-   nv50->pipe.winsys = pipe_winsys;
-   nv50->pipe.screen = pscreen;
-   nv50->pipe.priv = priv;
+   pipe->winsys = pipe_winsys;
+   pipe->screen = pscreen;
+   pipe->priv = priv;
 
-   nv50->pipe.destroy = nv50_destroy;
+   pipe->destroy = nv50_destroy;
 
-   nv50->pipe.draw_vbo = nv50_draw_vbo;
-   nv50->pipe.clear = nv50_clear;
+   pipe->draw_vbo = nv50_draw_vbo;
+   pipe->clear = nv50_clear;
 
-   nv50->pipe.flush = nv50_flush;
+   pipe->flush = nv50_flush;
 
    if (!screen->cur_ctx)
       screen->cur_ctx = nv50;
@@ -109,13 +115,13 @@ nv50_create(struct pipe_screen *pscreen, void *priv)
    nv50_init_query_functions(nv50);
    nv50_init_surface_functions(nv50);
    nv50_init_state_functions(nv50);
-   nv50_init_resource_functions(&nv50->pipe);
+   nv50_init_resource_functions(pipe);
 
-   nv50->draw = draw_create(&nv50->pipe);
+   nv50->draw = draw_create(pipe);
    assert(nv50->draw);
    draw_set_rasterize_stage(nv50->draw, nv50_draw_render_stage(nv50));
 
-   return &nv50->pipe;
+   return pipe;
 }
 
 struct resident {
diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index 55d996da27..e6079a621a 100644
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -19,6 +19,7 @@
 #include "nv50_program.h"
 #include "nv50_resource.h"
 
+#include "nouveau/nouveau_context.h"
 #include "nouveau/nv_object.xml.h"
 #include "nouveau/nv_m2mf.xml.h"
 #include "nv50_3ddefs.xml.h"
@@ -67,7 +68,7 @@
 #define NV50_CB_AUX 127
 
 struct nv50_context {
-   struct pipe_context pipe;
+   struct nouveau_context base;
 
    struct nv50_screen *screen;
 
@@ -122,7 +123,6 @@ struct nv50_context {
 
    unsigned sample_mask;
 
-   boolean vbo_dirty;
    boolean vbo_push_hint;
 
    struct draw_context *draw;
@@ -204,11 +204,11 @@ nv50_create_sampler_view(struct pipe_context *,
 
 /* nv50_transfer.c */
 void
-nv50_sifc_linear_u8(struct pipe_context *pipe,
+nv50_sifc_linear_u8(struct nouveau_context *pipe,
                     struct nouveau_bo *dst, unsigned offset, unsigned domain,
                     unsigned size, void *data);
 void
-nv50_m2mf_copy_linear(struct pipe_context *pipe,
+nv50_m2mf_copy_linear(struct nouveau_context *pipe,
                       struct nouveau_bo *dst, unsigned dstoff, unsigned dstdom,
                       struct nouveau_bo *src, unsigned srcoff, unsigned srcdom,
                       unsigned size);
diff --git a/src/gallium/drivers/nv50/nv50_push.c b/src/gallium/drivers/nv50/nv50_push.c
index 07034bdcf6..71b5995a4f 100644
--- a/src/gallium/drivers/nv50/nv50_push.c
+++ b/src/gallium/drivers/nv50/nv50_push.c
@@ -229,7 +229,7 @@ nv50_push_vbo(struct nv50_context *nv50, const struct pipe_draw_info *info)
       struct pipe_vertex_buffer *vb = &nv50->vtxbuf[i];
       struct nv04_resource *res = nv04_resource(vb->buffer);
 
-      data = nouveau_resource_map_offset(&nv50->pipe, res,
+      data = nouveau_resource_map_offset(&nv50->base, res,
                                          vb->buffer_offset, NOUVEAU_BO_RD);
 
       if (apply_bias && likely(!(nv50->vertex->instance_bufs & (1 << i))))
@@ -239,7 +239,7 @@ nv50_push_vbo(struct nv50_context *nv50, const struct pipe_draw_info *info)
    }
 
    if (info->indexed) {
-      ctx.idxbuf = nouveau_resource_map_offset(&nv50->pipe,
+      ctx.idxbuf = nouveau_resource_map_offset(&nv50->base,
                                                nv04_resource(nv50->idxbuf.buffer),
                                                nv50->idxbuf.offset, NOUVEAU_BO_RD);
       if (!ctx.idxbuf)
diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index 2e65c54e54..2dce94a477 100644
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -326,10 +326,12 @@ nv50_render_condition(struct pipe_context *pipe,
 void
 nv50_init_query_functions(struct nv50_context *nv50)
 {
-   nv50->pipe.create_query = nv50_query_create;
-   nv50->pipe.destroy_query = nv50_query_destroy;
-   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;
+   struct pipe_context *pipe = &nv50->base.pipe;
+
+   pipe->create_query = nv50_query_create;
+   pipe->destroy_query = nv50_query_destroy;
+   pipe->begin_query = nv50_query_begin;
+   pipe->end_query = nv50_query_end;
+   pipe->get_query_result = nv50_query_result;
+   pipe->render_condition = nv50_render_condition;
 }
diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c
index 13c03b1a7e..f2b03e8156 100644
--- a/src/gallium/drivers/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nv50/nv50_screen.c
@@ -310,8 +310,6 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
 
    screen->base.vertex_buffer_flags = screen->base.index_buffer_flags =
       NOUVEAU_BO_GART;
-   screen->base.copy_data = nv50_m2mf_copy_linear;
-   screen->base.push_data = nv50_sifc_linear_u8;
 
    ret = nouveau_bo_new(dev, NOUVEAU_BO_GART | NOUVEAU_BO_MAP, 0, 4096,
                         &screen->fence.bo);
diff --git a/src/gallium/drivers/nv50/nv50_shader_state.c b/src/gallium/drivers/nv50/nv50_shader_state.c
index 2d7572820f..7d4b12bde1 100644
--- a/src/gallium/drivers/nv50/nv50_shader_state.c
+++ b/src/gallium/drivers/nv50/nv50_shader_state.c
@@ -76,7 +76,7 @@ nv50_constbufs_validate(struct nv50_context *nv50)
             assert(0);
 
             if (!nouveau_resource_mapped_by_gpu(&res->base)) {
-               nouveau_buffer_migrate(&nv50->pipe, res, NOUVEAU_BO_VRAM);
+               nouveau_buffer_migrate(&nv50->base, res, NOUVEAU_BO_VRAM);
 
                BEGIN_RING(chan, RING_3D(CODE_CB_FLUSH), 1);
                OUT_RING  (chan, 0);
@@ -149,7 +149,7 @@ nv50_program_validate(struct nv50_context *nv50, struct nv50_program *prog)
       return FALSE;
    prog->code_base = prog->res->start;
 
-   nv50_sifc_linear_u8(&nv50->pipe, nv50->screen->code,
+   nv50_sifc_linear_u8(&nv50->base, nv50->screen->code,
                        (prog->type << 16) + prog->code_base,
                        NOUVEAU_BO_VRAM, prog->code_size, prog->code);
 
diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index 6b1106341c..17f272bb3b 100644
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -793,55 +793,57 @@ nv50_vertex_state_bind(struct pipe_context *pipe, void *hwcso)
 void
 nv50_init_state_functions(struct nv50_context *nv50)
 {
-   nv50->pipe.create_blend_state = nv50_blend_state_create;
-   nv50->pipe.bind_blend_state = nv50_blend_state_bind;
-   nv50->pipe.delete_blend_state = nv50_blend_state_delete;
-
-   nv50->pipe.create_rasterizer_state = nv50_rasterizer_state_create;
-   nv50->pipe.bind_rasterizer_state = nv50_rasterizer_state_bind;
-   nv50->pipe.delete_rasterizer_state = nv50_rasterizer_state_delete;
-
-   nv50->pipe.create_depth_stencil_alpha_state = nv50_zsa_state_create;
-   nv50->pipe.bind_depth_stencil_alpha_state = nv50_zsa_state_bind;
-   nv50->pipe.delete_depth_stencil_alpha_state = nv50_zsa_state_delete;
-
-   nv50->pipe.create_sampler_state = nv50_sampler_state_create;
-   nv50->pipe.delete_sampler_state = nv50_sampler_state_delete;
-   nv50->pipe.bind_vertex_sampler_states   = nv50_vp_sampler_states_bind;
-   nv50->pipe.bind_fragment_sampler_states = nv50_fp_sampler_states_bind;
-   nv50->pipe.bind_geometry_sampler_states = nv50_gp_sampler_states_bind;
-
-   nv50->pipe.create_sampler_view = nv50_create_sampler_view;
-   nv50->pipe.sampler_view_destroy = nv50_sampler_view_destroy;
-   nv50->pipe.set_vertex_sampler_views   = nv50_vp_set_sampler_views;
-   nv50->pipe.set_fragment_sampler_views = nv50_fp_set_sampler_views;
-   nv50->pipe.set_geometry_sampler_views = nv50_gp_set_sampler_views;
+   struct pipe_context *pipe = &nv50->base.pipe;
+
+   pipe->create_blend_state = nv50_blend_state_create;
+   pipe->bind_blend_state = nv50_blend_state_bind;
+   pipe->delete_blend_state = nv50_blend_state_delete;
+
+   pipe->create_rasterizer_state = nv50_rasterizer_state_create;
+   pipe->bind_rasterizer_state = nv50_rasterizer_state_bind;
+   pipe->delete_rasterizer_state = nv50_rasterizer_state_delete;
+
+   pipe->create_depth_stencil_alpha_state = nv50_zsa_state_create;
+   pipe->bind_depth_stencil_alpha_state = nv50_zsa_state_bind;
+   pipe->delete_depth_stencil_alpha_state = nv50_zsa_state_delete;
+
+   pipe->create_sampler_state = nv50_sampler_state_create;
+   pipe->delete_sampler_state = nv50_sampler_state_delete;
+   pipe->bind_vertex_sampler_states   = nv50_vp_sampler_states_bind;
+   pipe->bind_fragment_sampler_states = nv50_fp_sampler_states_bind;
+   pipe->bind_geometry_sampler_states = nv50_gp_sampler_states_bind;
+
+   pipe->create_sampler_view = nv50_create_sampler_view;
+   pipe->sampler_view_destroy = nv50_sampler_view_destroy;
+   pipe->set_vertex_sampler_views   = nv50_vp_set_sampler_views;
+   pipe->set_fragment_sampler_views = nv50_fp_set_sampler_views;
+   pipe->set_geometry_sampler_views = nv50_gp_set_sampler_views;
  
-   nv50->pipe.create_vs_state = nv50_vp_state_create;
-   nv50->pipe.create_fs_state = nv50_fp_state_create;
-   nv50->pipe.create_gs_state = nv50_gp_state_create;
-   nv50->pipe.bind_vs_state = nv50_vp_state_bind;
-   nv50->pipe.bind_fs_state = nv50_fp_state_bind;
-   nv50->pipe.bind_gs_state = nv50_gp_state_bind;
-   nv50->pipe.delete_vs_state = nv50_sp_state_delete;
-   nv50->pipe.delete_fs_state = nv50_sp_state_delete;
-   nv50->pipe.delete_gs_state = nv50_sp_state_delete;
-
-   nv50->pipe.set_blend_color = nv50_set_blend_color;
-   nv50->pipe.set_stencil_ref = nv50_set_stencil_ref;
-   nv50->pipe.set_clip_state = nv50_set_clip_state;
-   nv50->pipe.set_sample_mask = nv50_set_sample_mask;
-   nv50->pipe.set_constant_buffer = nv50_set_constant_buffer;
-   nv50->pipe.set_framebuffer_state = nv50_set_framebuffer_state;
-   nv50->pipe.set_polygon_stipple = nv50_set_polygon_stipple;
-   nv50->pipe.set_scissor_state = nv50_set_scissor_state;
-   nv50->pipe.set_viewport_state = nv50_set_viewport_state;
-
-   nv50->pipe.create_vertex_elements_state = nv50_vertex_state_create;
-   nv50->pipe.delete_vertex_elements_state = nv50_vertex_state_delete;
-   nv50->pipe.bind_vertex_elements_state = nv50_vertex_state_bind;
-
-   nv50->pipe.set_vertex_buffers = nv50_set_vertex_buffers;
-   nv50->pipe.set_index_buffer = nv50_set_index_buffer;
+   pipe->create_vs_state = nv50_vp_state_create;
+   pipe->create_fs_state = nv50_fp_state_create;
+   pipe->create_gs_state = nv50_gp_state_create;
+   pipe->bind_vs_state = nv50_vp_state_bind;
+   pipe->bind_fs_state = nv50_fp_state_bind;
+   pipe->bind_gs_state = nv50_gp_state_bind;
+   pipe->delete_vs_state = nv50_sp_state_delete;
+   pipe->delete_fs_state = nv50_sp_state_delete;
+   pipe->delete_gs_state = nv50_sp_state_delete;
+
+   pipe->set_blend_color = nv50_set_blend_color;
+   pipe->set_stencil_ref = nv50_set_stencil_ref;
+   pipe->set_clip_state = nv50_set_clip_state;
+   pipe->set_sample_mask = nv50_set_sample_mask;
+   pipe->set_constant_buffer = nv50_set_constant_buffer;
+   pipe->set_framebuffer_state = nv50_set_framebuffer_state;
+   pipe->set_polygon_stipple = nv50_set_polygon_stipple;
+   pipe->set_scissor_state = nv50_set_scissor_state;
+   pipe->set_viewport_state = nv50_set_viewport_state;
+
+   pipe->create_vertex_elements_state = nv50_vertex_state_create;
+   pipe->delete_vertex_elements_state = nv50_vertex_state_delete;
+   pipe->bind_vertex_elements_state = nv50_vertex_state_bind;
+
+   pipe->set_vertex_buffers = nv50_set_vertex_buffers;
+   pipe->set_index_buffer = nv50_set_index_buffer;
 }
 
diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
index b1f54f623a..dc9e2880f0 100644
--- a/src/gallium/drivers/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nv50/nv50_surface.c
@@ -371,9 +371,11 @@ nv50_clear(struct pipe_context *pipe, unsigned buffers,
 void
 nv50_init_surface_functions(struct nv50_context *nv50)
 {
-   nv50->pipe.resource_copy_region = nv50_resource_copy_region;
-   nv50->pipe.clear_render_target = nv50_clear_render_target;
-   nv50->pipe.clear_depth_stencil = nv50_clear_depth_stencil;
+   struct pipe_context *pipe = &nv50->base.pipe;
+
+   pipe->resource_copy_region = nv50_resource_copy_region;
+   pipe->clear_render_target = nv50_clear_render_target;
+   pipe->clear_depth_stencil = nv50_clear_depth_stencil;
 }
 
 
diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nv50/nv50_tex.c
index a76139ad37..4456553a86 100644
--- a/src/gallium/drivers/nv50/nv50_tex.c
+++ b/src/gallium/drivers/nv50/nv50_tex.c
@@ -269,7 +269,7 @@ nv50_validate_tsc(struct nv50_context *nv50, int s)
       if (tsc->id < 0) {
          tsc->id = nv50_screen_tsc_alloc(nv50->screen, tsc);
 
-         nv50_sifc_linear_u8(&nv50->pipe, nv50->screen->txc,
+         nv50_sifc_linear_u8(&nv50->base, nv50->screen->txc,
                              65536 + tsc->id * 32,
                              NOUVEAU_BO_VRAM, 32, tsc->tsc);
          need_flush = TRUE;
diff --git a/src/gallium/drivers/nv50/nv50_transfer.c b/src/gallium/drivers/nv50/nv50_transfer.c
index d80a535490..7486977459 100644
--- a/src/gallium/drivers/nv50/nv50_transfer.c
+++ b/src/gallium/drivers/nv50/nv50_transfer.c
@@ -102,12 +102,11 @@ nv50_m2mf_transfer_rect(struct pipe_screen *pscreen,
 }
 
 void
-nv50_sifc_linear_u8(struct pipe_context *pipe,
+nv50_sifc_linear_u8(struct nouveau_context *nv,
                     struct nouveau_bo *dst, unsigned offset, unsigned domain,
                     unsigned size, void *data)
 {
-   struct nv50_context *nv50 = nv50_context(pipe);
-   struct nouveau_channel *chan = nv50->screen->base.channel;
+   struct nouveau_channel *chan = nv->screen->channel;
    uint32_t *src = (uint32_t *)data;
    unsigned count = (size + 3) / 4;
    unsigned xcoord = offset & 0xff;
@@ -159,13 +158,12 @@ nv50_sifc_linear_u8(struct pipe_context *pipe,
 }
 
 void
-nv50_m2mf_copy_linear(struct pipe_context *pipe,
+nv50_m2mf_copy_linear(struct nouveau_context *nv,
                       struct nouveau_bo *dst, unsigned dstoff, unsigned dstdom,
                       struct nouveau_bo *src, unsigned srcoff, unsigned srcdom,
                       unsigned size)
 {
-   struct nv50_context *nv50 = nv50_context(pipe);
-   struct nouveau_channel *chan = nv50->screen->base.channel;
+   struct nouveau_channel *chan = nv->screen->channel;
 
    BEGIN_RING(chan, RING_MF(LINEAR_IN), 1);
    OUT_RING  (chan, 1);
diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index 1f0d34ed79..e94a2b6fa3 100644
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -131,7 +131,7 @@ nv50_emit_vtxattr(struct nv50_context *nv50, struct pipe_vertex_buffer *vb,
    float v[4];
    const unsigned nc = util_format_get_nr_components(ve->src_format);
 
-   data = nouveau_resource_map_offset(&nv50->pipe, res, vb->buffer_offset +
+   data = nouveau_resource_map_offset(&nv50->base, res, vb->buffer_offset +
                                       ve->src_offset, NOUVEAU_BO_RD);
 
    util_format_read_4f(ve->src_format, v, 0, data, 0, 0, 0, 1, 1);
@@ -215,13 +215,13 @@ nv50_prevalidate_vbufs(struct nv50_context *nv50)
                nv50_vbuf_range(nv50, i, &base, &size);
                nouveau_user_buffer_upload(buf, base, size);
             } else {
-               nouveau_buffer_migrate(&nv50->pipe, buf, NOUVEAU_BO_GART);
+               nouveau_buffer_migrate(&nv50->base, buf, NOUVEAU_BO_GART);
             }
-            nv50->vbo_dirty = TRUE;
+            nv50->base.vbo_dirty = TRUE;
          }
       }
       nv50_bufctx_add_resident(nv50, NV50_BUFCTX_VERTEX, buf, NOUVEAU_BO_RD);
-      nouveau_buffer_adjust_score(&nv50->pipe, buf, 1);
+      nouveau_buffer_adjust_score(&nv50->base, buf, 1);
    }
 }
 
@@ -262,7 +262,7 @@ nv50_update_user_vbufs(struct nv50_context *nv50)
       OUT_RESRCh(chan, buf, offset, NOUVEAU_BO_RD);
       OUT_RESRCl(chan, buf, offset, NOUVEAU_BO_RD);
    }
-   nv50->vbo_dirty = TRUE;
+   nv50->base.vbo_dirty = TRUE;
 }
 
 static INLINE void
@@ -540,7 +540,7 @@ nv50_draw_elements(struct nv50_context *nv50, boolean shorten,
       struct nv04_resource *res = nv04_resource(nv50->idxbuf.buffer);
       unsigned offset = res->offset + nv50->idxbuf.offset;
 
-      nouveau_buffer_adjust_score(&nv50->pipe, res, 1);
+      nouveau_buffer_adjust_score(&nv50->base, res, 1);
 
       while (instance_count--) {
          BEGIN_RING(chan, RING_3D(VERTEX_BEGIN_GL), 1);
@@ -597,7 +597,7 @@ nv50_draw_elements(struct nv50_context *nv50, boolean shorten,
          mode |= NV50_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
       }
    } else {
-      data = nouveau_resource_map_offset(&nv50->pipe,
+      data = nouveau_resource_map_offset(&nv50->base,
                                          nv04_resource(nv50->idxbuf.buffer),
                                          nv50->idxbuf.offset, NOUVEAU_BO_RD);
       if (!data)
@@ -669,10 +669,10 @@ nv50_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
       OUT_RING  (chan, info->start_instance);
    }
 
-   if (nv50->vbo_dirty) {
+   if (nv50->base.vbo_dirty) {
       BEGIN_RING(chan, RING_3D(VERTEX_ARRAY_FLUSH), 1);
       OUT_RING  (chan, 0);
-      nv50->vbo_dirty = FALSE;
+      nv50->base.vbo_dirty = FALSE;
    }
 
    if (!info->indexed) {