Merge branch 'mesa_7_6_branch'

[mesa.git] / src / gallium / drivers / nv50 / nv50_state_validate.c

diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index fd276203710f570f3cfc40dd3cea681ad5e671ff..956a70061541429f19b3ed4c3af155c210987a2c 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -23,6 +23,12 @@
 #include "nv50_context.h"
 #include "nouveau/nouveau_stateobj.h"
 
+#define NV50_CBUF_FORMAT_CASE(n) \
+       case PIPE_FORMAT_##n: so_data(so, NV50TCL_RT_FORMAT_##n); break
+
+#define NV50_ZETA_FORMAT_CASE(n) \
+       case PIPE_FORMAT_##n: so_data(so, NV50TCL_ZETA_FORMAT_##n); break
+
 static void
 nv50_state_validate_fb(struct nv50_context *nv50)
 {
@@ -54,15 +60,14 @@ nv50_state_validate_fb(struct nv50_context *nv50)
                so_reloc (so, bo, fb->cbufs[i]->offset, NOUVEAU_BO_VRAM |
                              NOUVEAU_BO_LOW | NOUVEAU_BO_RDWR, 0, 0);
                switch (fb->cbufs[i]->format) {
-               case PIPE_FORMAT_A8R8G8B8_UNORM:
-                       so_data(so, NV50TCL_RT_FORMAT_A8R8G8B8_UNORM);
-                       break;
-               case PIPE_FORMAT_X8R8G8B8_UNORM:
-                       so_data(so, NV50TCL_RT_FORMAT_X8R8G8B8_UNORM);
-                       break;
-               case PIPE_FORMAT_R5G6B5_UNORM:
-                       so_data(so, NV50TCL_RT_FORMAT_R5G6B5_UNORM);
-                       break;
+               NV50_CBUF_FORMAT_CASE(A8R8G8B8_UNORM);
+               NV50_CBUF_FORMAT_CASE(X8R8G8B8_UNORM);
+               NV50_CBUF_FORMAT_CASE(R5G6B5_UNORM);
+               NV50_CBUF_FORMAT_CASE(R16G16B16A16_SNORM);
+               NV50_CBUF_FORMAT_CASE(R16G16B16A16_UNORM);
+               NV50_CBUF_FORMAT_CASE(R32G32B32A32_FLOAT);
+               NV50_CBUF_FORMAT_CASE(R16G16_SNORM);
+               NV50_CBUF_FORMAT_CASE(R16G16_UNORM);
                default:
                        NOUVEAU_ERR("AIIII unknown format %s\n",
                                    pf_name(fb->cbufs[i]->format));
@@ -96,18 +101,10 @@ nv50_state_validate_fb(struct nv50_context *nv50)
                so_reloc (so, bo, fb->zsbuf->offset, NOUVEAU_BO_VRAM |
                              NOUVEAU_BO_LOW | NOUVEAU_BO_RDWR, 0, 0);
                switch (fb->zsbuf->format) {
-               case PIPE_FORMAT_Z32_FLOAT:
-                       so_data(so, NV50TCL_ZETA_FORMAT_Z32_FLOAT);
-                       break;
-               case PIPE_FORMAT_Z24S8_UNORM:
-                       so_data(so, NV50TCL_ZETA_FORMAT_Z24S8_UNORM);
-                       break;
-               case PIPE_FORMAT_X8Z24_UNORM:
-                       so_data(so, NV50TCL_ZETA_FORMAT_X8Z24_UNORM);
-                       break;
-               case PIPE_FORMAT_S8Z24_UNORM:
-                       so_data(so, NV50TCL_ZETA_FORMAT_S8Z24_UNORM);
-                       break;
+               NV50_ZETA_FORMAT_CASE(S8Z24_UNORM);
+               NV50_ZETA_FORMAT_CASE(X8Z24_UNORM);
+               NV50_ZETA_FORMAT_CASE(Z24S8_UNORM);
+               NV50_ZETA_FORMAT_CASE(Z32_FLOAT);
                default:
                        NOUVEAU_ERR("AIIII unknown format %s\n",
                                    pf_name(fb->zsbuf->format));
@@ -222,6 +219,9 @@ nv50_state_flush_notify(struct nouveau_channel *chan)
 {
        struct nv50_context *nv50 = chan->user_private;
 
+       if (nv50->state.tic_upload && !(nv50->dirty & NV50_NEW_TEXTURE))
+               so_emit(chan, nv50->state.tic_upload);
+
        so_emit_reloc_markers(chan, nv50->state.fb);
        so_emit_reloc_markers(chan, nv50->state.vertprog);
        so_emit_reloc_markers(chan, nv50->state.fragprog);
@@ -233,6 +233,7 @@ boolean
 nv50_state_validate(struct nv50_context *nv50)
 {
        struct nouveau_grobj *tesla = nv50->screen->tesla;
+       struct nouveau_grobj *eng2d = nv50->screen->eng2d;
        struct nouveau_stateobj *so;
        unsigned i;
 
@@ -354,18 +355,25 @@ scissor_uptodate:
 viewport_uptodate:
 
        if (nv50->dirty & NV50_NEW_SAMPLER) {
-               int i;
+               unsigned i;
+
+               so = so_new(nv50->sampler_nr * 9 + 23 + 4, 2);
+
+               nv50_so_init_sifc(nv50, so, nv50->screen->tsc, NOUVEAU_BO_VRAM,
+                                 nv50->sampler_nr * 8 * 4);
 
-               so = so_new(nv50->sampler_nr * 9 + 2, 0);
-               so_method(so, tesla, NV50TCL_CB_ADDR, 1);
-               so_data  (so, NV50_CB_TSC);
                for (i = 0; i < nv50->sampler_nr; i++) {
                        if (!nv50->sampler[i])
                                continue;
-
-                       so_method(so, tesla, NV50TCL_CB_DATA(0) | (2<<29), 8);
+                       so_method(so, eng2d, NV50_2D_SIFC_DATA | (2 << 29), 8);
                        so_datap (so, nv50->sampler[i]->tsc, 8);
                }
+
+               so_method(so, tesla, 0x1440, 1); /* sync SIFC */
+               so_data  (so, 0);
+               so_method(so, tesla, 0x1334, 1); /* flush TSC */
+               so_data  (so, 0);
+
                so_ref(so, &nv50->state.tsc_upload);
                so_ref(NULL, &so);
        }
@@ -383,3 +391,33 @@ viewport_uptodate:
        return TRUE;
 }
 
+void nv50_so_init_sifc(struct nv50_context *nv50,
+                      struct nouveau_stateobj *so,
+                      struct nouveau_bo *bo, unsigned reloc, unsigned size)
+{
+       struct nouveau_grobj *eng2d = nv50->screen->eng2d;
+
+       so_method(so, eng2d, NV50_2D_DST_FORMAT, 2);
+       so_data  (so, NV50_2D_DST_FORMAT_R8_UNORM);
+       so_data  (so, 1);
+       so_method(so, eng2d, NV50_2D_DST_PITCH, 5);
+       so_data  (so, 262144);
+       so_data  (so, 65536);
+       so_data  (so, 1);
+       so_reloc (so, bo, 0, reloc | NOUVEAU_BO_WR | NOUVEAU_BO_HIGH, 0, 0);
+       so_reloc (so, bo, 0, reloc | NOUVEAU_BO_WR | NOUVEAU_BO_LOW, 0, 0);
+       so_method(so, eng2d, NV50_2D_SIFC_UNK0800, 2);
+       so_data  (so, 0);
+       so_data  (so, NV50_2D_SIFC_FORMAT_R8_UNORM);
+       so_method(so, eng2d, NV50_2D_SIFC_WIDTH, 10);
+       so_data  (so, size);
+       so_data  (so, 1);
+       so_data  (so, 0);
+       so_data  (so, 1);
+       so_data  (so, 0);
+       so_data  (so, 1);
+       so_data  (so, 0);
+       so_data  (so, 0);
+       so_data  (so, 0);
+       so_data  (so, 0);
+}