nv50: inline nv50_state_flush_notify()

It's (rightly) not called from anywhere else now

diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
index 6865686690d30043b984383fa383821b874effef..8793c2aac5d340b7915c2e9c7ce6271cc0ed6d41 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.h
+++ b/src/gallium/drivers/nv50/nv50_context.h
@@ -235,7 +235,6 @@ extern void nv50_program_destroy(struct nv50_context *nv50,
 
 /* nv50_state_validate.c */
 extern boolean nv50_state_validate(struct nv50_context *nv50, unsigned dwords);
-extern void nv50_state_flush_notify(struct nouveau_channel *chan);
 
 extern void nv50_so_init_sifc(struct nv50_context *nv50,
                              struct nouveau_stateobj *so,

diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index 61be3a45fda49b1b58f4108814d6a0449611ba89..2c8e7ca7982cbd273c6fdd49d94e638fbab437b2 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -370,20 +370,6 @@ struct state_validate {
 };
 #define validate_list_len (sizeof(validate_list) / sizeof(validate_list[0]))
 
-void
-nv50_state_flush_notify(struct nouveau_channel *chan)
-{
-       struct nv50_context *nv50 = chan->user_private;
-
-       nv50_tex_relocs(nv50);
-
-       so_emit_reloc_markers(chan, nv50->state.hw[0]); /* fb */
-       so_emit_reloc_markers(chan, nv50->state.hw[3]); /* vp */
-       so_emit_reloc_markers(chan, nv50->state.hw[4]); /* fp */
-       so_emit_reloc_markers(chan, nv50->state.hw[17]); /* vb */
-       so_emit_reloc_markers(chan, nv50->screen->static_init);
-}
-
 boolean
 nv50_state_validate(struct nv50_context *nv50, unsigned wait_dwords)
 {
@@ -446,7 +432,12 @@ nv50_state_validate(struct nv50_context *nv50, unsigned wait_dwords)
         * this the kernel is given no clue that the buffer is being used
         * still.  This can cause all sorts of fun issues.
         */
-       nv50_state_flush_notify(chan);
+       nv50_tex_relocs(nv50);
+       so_emit_reloc_markers(chan, nv50->state.hw[0]); /* fb */
+       so_emit_reloc_markers(chan, nv50->state.hw[3]); /* vp */
+       so_emit_reloc_markers(chan, nv50->state.hw[4]); /* fp */
+       so_emit_reloc_markers(chan, nv50->state.hw[17]); /* vb */
+       so_emit_reloc_markers(chan, nv50->screen->static_init);
 
        /* No idea.. */
        BEGIN_RING(chan, tesla, 0x142c, 1);