Revert "nv50: move some magics"

This reverts commit 0a38de30429d3075fc6dfc9ff3729c5ca11f0c2f.

diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c
index 934b67fb71164e7431cf561372b40170eae2523c..d69eb4b86be9d9a41ed36a8a4fedfaeeb5405f73 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_program.c
+++ b/src/gallium/drivers/nv50/nv50_program.c
@@ -1492,26 +1492,14 @@ nv50_fragprog_validate(struct nv50_context *nv50)
        nv50_program_validate_data(nv50, p);
        nv50_program_validate_code(nv50, p);
 
-       so = so_new(64, 2);
+       so = so_new(7, 2);
        so_method(so, tesla, NV50TCL_FP_ADDRESS_HIGH, 2);
        so_reloc (so, p->buffer, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_RD |
                  NOUVEAU_BO_HIGH, 0, 0);
        so_reloc (so, p->buffer, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_RD |
                  NOUVEAU_BO_LOW, 0, 0);
-       so_method(so, tesla, 0x1904, 4);
-       so_data  (so, 0x01040404); /* p: 0x01000404 */
-       so_data  (so, 0x00000004);
-       so_data  (so, 0x00000000);
-       so_data  (so, 0x00000000);
-       so_method(so, tesla, 0x16bc, 2);
-       so_data  (so, 0x03020100);
-       so_data  (so, 0x07060504);
-       so_method(so, tesla, 0x1988, 2);
-       so_data  (so, 0x08040404); /* p: 0x0f000401 */
+       so_method(so, tesla, 0x198c, 1);
        so_data  (so, p->cfg.high_temp);
-       so_method(so, tesla, 0x16ac, 2);
-       so_data  (so, 0x00000008); /* p: 0x00000004 */
-       so_data  (so, 0x00000004);
        so_method(so, tesla, 0x1414, 1);
        so_data  (so, 0); /* program start offset */
        so_emit(nv50->screen->nvws, so);

diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c
index 2417bf800135947f9bf9ed28449722a329c1ff14..6c0810a9cfe01fc6263ae8a936834f9a81990f12 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nv50/nv50_screen.c
@@ -225,6 +225,15 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws)
        so_data  (so, 0x54);
        so_method(so, screen->tesla, 0x13ac, 1);
        so_data  (so, 1);
+       so_method(so, screen->tesla, 0x16bc, 2);
+       so_data  (so, 0x03020100);
+       so_data  (so, 0x07060504);
+       so_method(so, screen->tesla, 0x1988, 2);
+       so_data  (so, 0x08040404);
+       so_data  (so, 0x00000004);
+       so_method(so, screen->tesla, 0x16ac, 2);
+       so_data  (so, 8);
+       so_data  (so, 4);
        so_method(so, screen->tesla, 0x16b8, 1);
        so_data  (so, 8);