nv50: update context-related tables for original 8800GTS

I either messed up when I pulled these from a mmio-trace last time, or
the previous values didn't work on my card.  Hopefully it's the former!

In any case, at least one of the original NV50 chipsets work now.

diff --git a/shared-core/nv50_grctx.h b/shared-core/nv50_grctx.h
index b45e79d..848129e 100644 (file)
--- a/shared-core/nv50_grctx.h
+++ b/shared-core/nv50_grctx.h
@@ -4,69 +4,70 @@
 static uint32_t nv50_ctxprog[] = {
        0x0070008e, 0x0070009c, 0x00200020, 0x00600008, 0x0050004c, 0x00400e89,
        0x00200000, 0x00600007, 0x00300000, 0x00c000ff, 0x00200000, 0x008000ff,
-       0x00700009, 0x00417e4d, 0x00401e44, 0x00401e05, 0x00401e0d, 0x00415a06,
+       0x00700009, 0x0041874d, 0x00401e44, 0x00401e05, 0x00401e0d, 0x00416306,
        0x00600005, 0x004015c5, 0x00600011, 0x00401c0b, 0x0090ffff, 0x0091ffff,
-       0x00200020, 0x00600008, 0x0050004c, 0x00600009, 0x00415a45, 0x0041754d,
+       0x00200020, 0x00600008, 0x0050004c, 0x00600009, 0x00416345, 0x00417e4d,
        0x0070009d, 0x004022cf, 0x0070009f, 0x0050009f, 0x00401fc0, 0x00200080,
        0x00600008, 0x00401f4f, 0x00401fc0, 0x004025cc, 0x00700081, 0x00200000,
-       0x00600006, 0x00700000, 0x00111bfc, 0x00700080, 0x00700083, 0x00200047,
-       0x00600006, 0x0011020a, 0x002005c0, 0x00600007, 0x00300000, 0x00c000ff,
-       0x00c800ff, 0x00416507, 0x00202627, 0x008000ff, 0x00403c8c, 0x005000cb, 
-       0x00a0023f, 0x00200040, 0x00600006, 0x0070000f, 0x00170202, 0x0011020a,
-       0x00200032, 0x0010020d, 0x001b0242, 0x00120302, 0x00140402, 0x00180500,
-       0x00130509, 0x00150550, 0x00110605, 0x001e0607, 0x00110700, 0x00110900,
-       0x00110902, 0x00110a00, 0x00160b02, 0x00110b28, 0x00140b2b, 0x00110c01,
-       0x00111400, 0x00111405, 0x00111407, 0x00111409, 0x0011140b, 0x002000ea,
-       0x00101500, 0x0040640f, 0x0040644b, 0x00213700, 0x00600007, 0x00200440,
-       0x008800ff, 0x0070008f, 0x0040648c, 0x005000cb, 0x00000000, 0x001118f8,
-       0x0020002b, 0x00101a05, 0x00131c00, 0x00111c04, 0x00141c20, 0x00111c25,
-       0x00131c40, 0x00111c44, 0x00141c60, 0x00111c65, 0x00131c80, 0x00111c84,
-       0x00141ca0, 0x00111ca5, 0x00131cc0, 0x00111cc4, 0x00141ce0, 0x00111ce5,
-       0x00131d00, 0x00111d04, 0x00141d20, 0x00111d25, 0x00131d40, 0x00111d44,
-       0x00141d60, 0x00111d65, 0x00131f00, 0x00191f40, 0x00409ee0, 0x00200217,
-       0x00600006, 0x00200044, 0x00102080, 0x001120c6, 0x001520c9, 0x001920d0,
-       0x00122100, 0x00122103, 0x00162200, 0x0040960f, 0x0040964b, 0x00213700,
-       0x00600007, 0x00200440, 0x008800ff, 0x0070008f, 0x0040968c, 0x005000cb,
-       0x00000000, 0x00122207, 0x00112280, 0x00112300, 0x00112302, 0x00122380,
-       0x0011238b, 0x00192394, 0x0040b0e1, 0x00200285, 0x00600006, 0x00200044,
-       0x00102480, 0x001124c6, 0x001524c9, 0x001924d0, 0x00122500, 0x00122503,
-       0x00162600, 0x00122607, 0x00112680, 0x00112700, 0x00112702, 0x00122780,
-       0x0011278b, 0x00192794, 0x0040cce2, 0x002002f3, 0x00600006, 0x00200044,
-       0x00102880, 0x001128c6, 0x001528c9, 0x0040c00f, 0x0040c04b, 0x00213700,
-       0x00600007, 0x00200440, 0x008800ff, 0x0070008f, 0x0040c08c, 0x005000cb,
-       0x00000000, 0x001928d0, 0x00122900, 0x00122903, 0x00162a00, 0x00122a07,
-       0x00112a80, 0x00112b00, 0x00112b02, 0x00122b80, 0x00112b8b, 0x00192b94, 
-       0x0040dee3, 0x00200361, 0x00600006, 0x00200044, 0x00102c80, 0x00112cc6,
-       0x00152cc9, 0x00192cd0, 0x00122d00, 0x00122d03, 0x00162e00, 0x00122e07,
-       0x00112e80, 0x00112f00, 0x00112f02, 0x00122f80, 0x00112f8b, 0x00192f94,
-       0x0040fae4, 0x002003cf, 0x00600006, 0x00200044, 0x00103080, 0x0040ec0f,
-       0x0040ec4b, 0x00213700, 0x00600007, 0x00200440, 0x008800ff, 0x0070008f, 
-       0x0040ec8c, 0x005000cb, 0x00000000, 0x001130c6, 0x001530c9, 0x001930d0,
-       0x00123100, 0x00123103, 0x00163200, 0x00123207, 0x00113280, 0x00113300,
-       0x00113302, 0x00123380, 0x0011338b, 0x00193394, 0x00410ce5, 0x0020043d,
-       0x00600006, 0x00200044, 0x00103480, 0x001134c6, 0x001534c9, 0x001934d0,
-       0x00123500, 0x00123503, 0x00163600, 0x00123607, 0x00113680, 0x00113700,
-       0x00113702, 0x00123780, 0x0011378b, 0x00193794, 0x004128e6, 0x002004ab,
-       0x00600006, 0x00200044, 0x00103880, 0x00411a0f, 0x00411a4b, 0x00213700,
-       0x00600007, 0x00200440, 0x008800ff, 0x0070008f, 0x00411a8c, 0x005000cb,
-       0x00000000, 0x001138c6, 0x001538c9, 0x001938d0, 0x00123900, 0x00123903,
-       0x00163a00, 0x00123a07, 0x00113a80, 0x00113b00, 0x00113b02, 0x00123b80,
-       0x00113b8b, 0x00193b94, 0x00413ae7, 0x00200519, 0x00600006, 0x00200044,
-       0x00103c80, 0x00113cc6, 0x00153cc9, 0x00193cd0, 0x00123d00, 0x00123d03,
-       0x00163e00, 0x00123e07, 0x00113e80, 0x00113f00, 0x00113f02, 0x00123f80,
-       0x00113f8b, 0x00193f94, 0x00000000, 0x0041410f, 0x005000cb, 0x00213700,
-       0x00600007, 0x00200440, 0x008800ff, 0x005000cb, 0x00414487, 0x0060000a,
-       0x00000000, 0x00415300, 0x007000a0, 0x00700080, 0x002005c0, 0x00600007,
-       0x00200004, 0x00c000ff, 0x008000ff, 0x005000cb, 0x00700000, 0x00200000,
-       0x00600006, 0x00111bfe, 0x0041754d, 0x00700000, 0x00200000, 0x00600006,
-       0x00111bfe, 0x00700080, 0x0070001d, 0x0040114d, 0x00700081, 0x00600004,
-       0x0050004a, 0x00415f88, 0x0060000b, 0x00200000, 0x00600006, 0x00700000,
-       0x0041750b, 0x00111bfd, 0x00402e4d, 0x00202627, 0x008000fd, 0x005000cb,
-       0x00c00002, 0x002005c0, 0x00600007, 0x0020015f, 0x00800002, 0x005000cb,
-       0x00c01802, 0x002024c8, 0x00800002, 0x005000cb, 0x00403a4d, 0x0060000b,
-       0x0041734d, 0x00700001, 0x00700003, 0x00417906, 0x00417a05, 0x0060000d,
-       0x00700005, 0x0070000d, 0x00700006, 0x0070000b, 0x0070000e, 0x0070001c,
-       0x0060000c, ~0
+       0x00600006, 0x00700000, 0x00111bfc, 0x00700083, 0x00300000, 0x00215900,
+       0x00600007, 0x00c00b01, 0x0020001c, 0x00800001, 0x005000cb, 0x00c000ff,
+       0x00700080, 0x00700083, 0x00200047, 0x00600006, 0x0011020a, 0x002005c0,
+       0x00600007, 0x00300000, 0x00c000ff, 0x00c800ff, 0x00416e07, 0x00202627,
+       0x008000ff, 0x0040458c, 0x005000cb, 0x00a0023f, 0x00200040, 0x00600006,
+       0x0070000f, 0x00170202, 0x0011020a, 0x00200032, 0x0010020d, 0x001b0242,
+       0x00120302, 0x00140402, 0x00180500, 0x00130509, 0x00150550, 0x00110605,
+       0x001e0607, 0x00110700, 0x00110900, 0x00110902, 0x00110a00, 0x00160b02,
+       0x00110b28, 0x00140b2b, 0x00110c01, 0x00111400, 0x00111405, 0x00111407,
+       0x00111409, 0x0011140b, 0x002000ea, 0x00101500, 0x00406d0f, 0x00406d4b,
+       0x00213700, 0x00600007, 0x00200440, 0x008800ff, 0x0070008f, 0x00406d8c,
+       0x005000cb, 0x00000000, 0x001118f8, 0x0020002b, 0x00101a05, 0x00131c00,
+       0x00111c04, 0x00141c20, 0x00111c25, 0x00131c40, 0x00111c44, 0x00141c60,
+       0x00111c65, 0x00131c80, 0x00111c84, 0x00141ca0, 0x00111ca5, 0x00131cc0,
+       0x00111cc4, 0x00141ce0, 0x00111ce5, 0x00131d00, 0x00111d04, 0x00141d20,
+       0x00111d25, 0x00131d40, 0x00111d44, 0x00141d60, 0x00111d65, 0x00131f00,
+       0x00191f40, 0x0040a7e0, 0x00200217, 0x00600006, 0x00200044, 0x00102080,
+       0x001120c6, 0x001520c9, 0x001920d0, 0x00122100, 0x00122103, 0x00162200,
+       0x00409f0f, 0x00409f4b, 0x00213700, 0x00600007, 0x00200440, 0x008800ff,
+       0x0070008f, 0x00409f8c, 0x005000cb, 0x00000000, 0x00122207, 0x00112280,
+       0x00112300, 0x00112302, 0x00122380, 0x0011238b, 0x00192394, 0x0040b9e1,
+       0x00200285, 0x00600006, 0x00200044, 0x00102480, 0x001124c6, 0x001524c9,
+       0x001924d0, 0x00122500, 0x00122503, 0x00162600, 0x00122607, 0x00112680,
+       0x00112700, 0x00112702, 0x00122780, 0x0011278b, 0x00192794, 0x0040d5e2,
+       0x002002f3, 0x00600006, 0x00200044, 0x00102880, 0x001128c6, 0x001528c9,
+       0x0040c90f, 0x0040c94b, 0x00213700, 0x00600007, 0x00200440, 0x008800ff,
+       0x0070008f, 0x0040c98c, 0x005000cb, 0x00000000, 0x001928d0, 0x00122900,
+       0x00122903, 0x00162a00, 0x00122a07, 0x00112a80, 0x00112b00, 0x00112b02,
+       0x00122b80, 0x00112b8b, 0x00192b94, 0x0040e7e3, 0x00200361, 0x00600006,
+       0x00200044, 0x00102c80, 0x00112cc6, 0x00152cc9, 0x00192cd0, 0x00122d00,
+       0x00122d03, 0x00162e00, 0x00122e07, 0x00112e80, 0x00112f00, 0x00112f02,
+       0x00122f80, 0x00112f8b, 0x00192f94, 0x004103e4, 0x002003cf, 0x00600006,
+       0x00200044, 0x00103080, 0x0040f50f, 0x0040f54b, 0x00213700, 0x00600007,
+       0x00200440, 0x008800ff, 0x0070008f, 0x0040f58c, 0x005000cb, 0x00000000,
+       0x001130c6, 0x001530c9, 0x001930d0, 0x00123100, 0x00123103, 0x00163200,
+       0x00123207, 0x00113280, 0x00113300, 0x00113302, 0x00123380, 0x0011338b,
+       0x00193394, 0x004115e5, 0x0020043d, 0x00600006, 0x00200044, 0x00103480,
+       0x001134c6, 0x001534c9, 0x001934d0, 0x00123500, 0x00123503, 0x00163600,
+       0x00123607, 0x00113680, 0x00113700, 0x00113702, 0x00123780, 0x0011378b,
+       0x00193794, 0x004131e6, 0x002004ab, 0x00600006, 0x00200044, 0x00103880,
+       0x0041230f, 0x0041234b, 0x00213700, 0x00600007, 0x00200440, 0x008800ff,
+       0x0070008f, 0x0041238c, 0x005000cb, 0x00000000, 0x001138c6, 0x001538c9,
+       0x001938d0, 0x00123900, 0x00123903, 0x00163a00, 0x00123a07, 0x00113a80,
+       0x00113b00, 0x00113b02, 0x00123b80, 0x00113b8b, 0x00193b94, 0x004143e7,
+       0x00200519, 0x00600006, 0x00200044, 0x00103c80, 0x00113cc6, 0x00153cc9,
+       0x00193cd0, 0x00123d00, 0x00123d03, 0x00163e00, 0x00123e07, 0x00113e80,
+       0x00113f00, 0x00113f02, 0x00123f80, 0x00113f8b, 0x00193f94, 0x00000000,
+       0x00414a0f, 0x005000cb, 0x00213700, 0x00600007, 0x00200440, 0x008800ff,
+       0x005000cb, 0x00414d87, 0x0060000a, 0x00000000, 0x00415c00, 0x007000a0,
+       0x00700080, 0x002005c0, 0x00600007, 0x00200004, 0x00c000ff, 0x008000ff,
+       0x005000cb, 0x00700000, 0x00200000, 0x00600006, 0x00111bfe, 0x00417e4d,
+       0x00700000, 0x00200000, 0x00600006, 0x00111bfe, 0x00700080, 0x0070001d,
+       0x0040114d, 0x00700081, 0x00600004, 0x0050004a, 0x00416888, 0x0060000b,
+       0x00200000, 0x00600006, 0x00700000, 0x00417e0b, 0x00111bfd, 0x0040374d,
+       0x00202627, 0x008000fd, 0x005000cb, 0x00c00002, 0x002005c0, 0x00600007,
+       0x0020015f, 0x00800002, 0x005000cb, 0x00c01802, 0x002024c8, 0x00800002,
+       0x005000cb, 0x0040434d, 0x0060000b, 0x00417c4d, 0x00700001, 0x00700003,
+       0x00418206, 0x00418305, 0x0060000d, 0x00700005, 0x0070000d, 0x00700006,
+       0x0070000b, 0x0070000e, 0x0070001c, 0x0060000c, ~0
 };
 
 static uint32_t nv50_ctxvals[] = {
@@ -120,10 +121,14 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x00000000,
        0x0002, 0x00000001,
        0x0001, 0x00000000,
+       0x0003, 0x00000001,
+       0x0001, 0x00000004,
+       0x0003, 0x00000001,
        0x0001, 0x00000007,
-       0x0007, 0x00000000,
        0x0001, 0x00000001,
-       0x0008, 0x00000000,
+       0x0001, 0x00000007,
+       0x0003, 0x00000001,
+       0x0004, 0x00000000,
        0x0002, 0x00000001,
        0x0001, 0x00000000,
        0x0001, 0x00000001,
@@ -131,8 +136,11 @@ static uint32_t nv50_ctxvals[] = {
        0x0003, 0x00000000,
        0x0001, 0x00000040,
        0x0001, 0x00000000,
+       0x0001, 0x00000002,
        0x0001, 0x00000100,
-       0x0009, 0x00000000,
+       0x0001, 0x00000001,
+       0x0001, 0x00000100,
+       0x0006, 0x00000000,
        0x0001, 0x00000001,
        0x0008, 0x00000000,
        0x0001, 0x00000004,
@@ -165,16 +173,31 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x00000070,
        0x0001, 0x00000080,
        0x0004, 0x00000000,
+       0x0001, 0x0000000c,
+       0x0001, 0x00000008,
+       0x0001, 0x00000014,
        0x0001, 0x00000026,
-       0x0005, 0x00000000,
+       0x0002, 0x00000000,
        0x0001, 0x00000001,
-       0x0017, 0x00000000,
+       0x0001, 0x00000002,
+       0x0001, 0x00000003,
+       0x0001, 0x00000004,
+       0x0001, 0x00000005,
+       0x0001, 0x00000006,
+       0x0001, 0x00000007,
+       0x0001, 0x00000001,
+       0x0010, 0x00000000,
        0x0001, 0x000000cf,
        0x000a, 0x00000000,
+       0x0001, 0x00000080,
+       0x0002, 0x00000004,
        0x0001, 0x00000001,
-       0x0004, 0x00000000,
+       0x0001, 0x00000000,
+       0x0001, 0x00000012,
+       0x0001, 0x00000010,
+       0x0001, 0x0000000c,
        0x0001, 0x00000001,
-       0x0006, 0x00000000,
+       0x0003, 0x00000000,
        0x0001, 0x00000004,
        0x0001, 0x00000002,
        0x0001, 0x00000004,
@@ -193,8 +216,8 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x00000002,
        0x0001, 0x00001000,
        0x0001, 0x00000000,
-       0x0001, 0x00000001,
-       0x0007, 0x00000000,
+       0x0005, 0x00000001,
+       0x0003, 0x00000000,
        0x0001, 0x00000200,
        0x0001, 0x00000000,
        0x0001, 0x00000001,
@@ -229,22 +252,46 @@ static uint32_t nv50_ctxvals[] = {
        0x0008, 0x00000000,
        0x0001, 0x1b74f820,
        0x0001, 0x89058001,
-       0x0007, 0x00000000,
+       0x0002, 0x00000000,
+       0x0001, 0x027c10fa,
+       0x0001, 0x000000c0,
+       0x0001, 0xb7892080,
+       0x0002, 0x00000000,
        0x0001, 0x1b74f820,
        0x0001, 0x89058001,
-       0x0007, 0x00000000,
+       0x0002, 0x00000000,
+       0x0001, 0x027c10fa,
+       0x0001, 0x000000c0,
+       0x0001, 0xb7892080,
+       0x0002, 0x00000000,
        0x0001, 0x1b74f820,
        0x0001, 0x89058001,
-       0x0007, 0x00000000,
+       0x0002, 0x00000000,
+       0x0001, 0x027c10fa,
+       0x0001, 0x000000c0,
+       0x0001, 0xb7892080,
+       0x0002, 0x00000000,
        0x0001, 0x1b74f820,
        0x0001, 0x89058001,
-       0x0007, 0x00000000,
+       0x0002, 0x00000000,
+       0x0001, 0x027c10fa,
+       0x0001, 0x000000c0,
+       0x0001, 0xb7892080,
+       0x0002, 0x00000000,
        0x0001, 0x1b74f820,
        0x0001, 0x89058001,
-       0x0007, 0x00000000,
+       0x0002, 0x00000000,
+       0x0001, 0x027c10fa,
+       0x0001, 0x000000c0,
+       0x0001, 0xb7892080,
+       0x0002, 0x00000000,
        0x0001, 0x1b74f820,
        0x0001, 0x89058001,
-       0x0007, 0x00000000,
+       0x0002, 0x00000000,
+       0x0001, 0x027c10fa,
+       0x0001, 0x000000c0,
+       0x0001, 0xb7892080,
+       0x0002, 0x00000000,
        0x0001, 0x00010040,
        0x0001, 0x00000000,
        0x0001, 0x00000022,
@@ -257,7 +304,7 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -273,7 +320,7 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -288,23 +335,40 @@ static uint32_t nv50_ctxvals[] = {
        0x0002, 0x00000000,
        0x0001, 0x0003ffff,
        0x0005, 0x00000000,
+       0x0001, 0x00120407,
+       0x0001, 0x05091507,
+       0x0001, 0x05010202,
        0x0001, 0x00030201,
-       0x0009, 0x00000000,
+       0x0006, 0x00000000,
+       0x0001, 0x00000040,
+       0x0001, 0x0d0c0b0a,
+       0x0001, 0x00141210,
+       0x0001, 0x000001f0,
+       0x0001, 0x00000001,
+       0x0001, 0x00000003,
        0x0001, 0x00008000,
-       0x0007, 0x00000000,
+       0x0001, 0x00000000,
+       0x0001, 0x00039e00,
+       0x0001, 0x00000040,
+       0x0001, 0x00003800,
+       0x0001, 0x00404040,
        0x0001, 0x0000ff0a,
-       0x0005, 0x00000000,
+       0x0001, 0x00000000,
        0x0001, 0x0077f005,
        0x0001, 0x00007fff,
        0x0002, 0x00000000,
-       0x0001, 0x0000000f,
-       0x0007, 0x00000000,
+       0x0001, 0x000003ff,
+       0x0002, 0x00000003,
+       0x0001, 0x000001ff,
+       0x0001, 0x0000001f,
+       0x0002, 0x0000000f,
+       0x0001, 0x00000000,
        0x0001, 0x01800000,
        0x0001, 0x00160000,
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -320,7 +384,7 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -335,23 +399,40 @@ static uint32_t nv50_ctxvals[] = {
        0x0002, 0x00000000,
        0x0001, 0x0003ffff,
        0x0005, 0x00000000,
+       0x0001, 0x00120407,
+       0x0001, 0x05091507,
+       0x0001, 0x05010202,
        0x0001, 0x00030201,
-       0x0009, 0x00000000,
+       0x0006, 0x00000000,
+       0x0001, 0x00000040,
+       0x0001, 0x0d0c0b0a,
+       0x0001, 0x00141210,
+       0x0001, 0x000001f0,
+       0x0001, 0x00000001,
+       0x0001, 0x00000003,
        0x0001, 0x00008000,
-       0x0007, 0x00000000,
+       0x0001, 0x00000000,
+       0x0001, 0x00039e00,
+       0x0001, 0x00000040,
+       0x0001, 0x00003800,
+       0x0001, 0x00404040,
        0x0001, 0x0000ff0a,
-       0x0005, 0x00000000,
+       0x0001, 0x00000000,
        0x0001, 0x0077f005,
        0x0001, 0x00007fff,
        0x0002, 0x00000000,
-       0x0001, 0x0000000f,
-       0x0007, 0x00000000,
+       0x0001, 0x000003ff,
+       0x0002, 0x00000003,
+       0x0001, 0x000001ff,
+       0x0001, 0x0000001f,
+       0x0002, 0x0000000f,
+       0x0001, 0x00000000,
        0x0001, 0x01800000,
        0x0001, 0x00160000,
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -367,7 +448,7 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -382,23 +463,40 @@ static uint32_t nv50_ctxvals[] = {
        0x0002, 0x00000000,
        0x0001, 0x0003ffff,
        0x0005, 0x00000000,
+       0x0001, 0x00120407,
+       0x0001, 0x05091507,
+       0x0001, 0x05010202,
        0x0001, 0x00030201,
-       0x0009, 0x00000000,
+       0x0006, 0x00000000,
+       0x0001, 0x00000040,
+       0x0001, 0x0d0c0b0a,
+       0x0001, 0x00141210,
+       0x0001, 0x000001f0,
+       0x0001, 0x00000001,
+       0x0001, 0x00000003,
        0x0001, 0x00008000,
-       0x0007, 0x00000000,
+       0x0001, 0x00000000,
+       0x0001, 0x00039e00,
+       0x0001, 0x00000040,
+       0x0001, 0x00003800,
+       0x0001, 0x00404040,
        0x0001, 0x0000ff0a,
-       0x0005, 0x00000000,
+       0x0001, 0x00000000,
        0x0001, 0x0077f005,
        0x0001, 0x00007fff,
        0x0002, 0x00000000,
-       0x0001, 0x0000000f,
-       0x0007, 0x00000000,
+       0x0001, 0x000003ff,
+       0x0002, 0x00000003,
+       0x0001, 0x000001ff,
+       0x0001, 0x0000001f,
+       0x0002, 0x0000000f,
+       0x0001, 0x00000000,
        0x0001, 0x01800000,
        0x0001, 0x00160000,
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -414,7 +512,7 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -429,23 +527,40 @@ static uint32_t nv50_ctxvals[] = {
        0x0002, 0x00000000,
        0x0001, 0x0003ffff,
        0x0005, 0x00000000,
+       0x0001, 0x00120407,
+       0x0001, 0x05091507,
+       0x0001, 0x05010202,
        0x0001, 0x00030201,
-       0x0009, 0x00000000,
+       0x0006, 0x00000000,
+       0x0001, 0x00000040,
+       0x0001, 0x0d0c0b0a,
+       0x0001, 0x00141210,
+       0x0001, 0x000001f0,
+       0x0001, 0x00000001,
+       0x0001, 0x00000003,
        0x0001, 0x00008000,
-       0x0007, 0x00000000,
+       0x0001, 0x00000000,
+       0x0001, 0x00039e00,
+       0x0001, 0x00000040,
+       0x0001, 0x00003800,
+       0x0001, 0x00404040,
        0x0001, 0x0000ff0a,
-       0x0005, 0x00000000,
+       0x0001, 0x00000000,
        0x0001, 0x0077f005,
        0x0001, 0x00007fff,
        0x0002, 0x00000000,
-       0x0001, 0x0000000f,
-       0x0007, 0x00000000,
+       0x0001, 0x000003ff,
+       0x0002, 0x00000003,
+       0x0001, 0x000001ff,
+       0x0001, 0x0000001f,
+       0x0002, 0x0000000f,
+       0x0001, 0x00000000,
        0x0001, 0x01800000,
        0x0001, 0x00160000,
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -461,7 +576,7 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -476,23 +591,40 @@ static uint32_t nv50_ctxvals[] = {
        0x0002, 0x00000000,
        0x0001, 0x0003ffff,
        0x0005, 0x00000000,
+       0x0001, 0x00120407,
+       0x0001, 0x05091507,
+       0x0001, 0x05010202,
        0x0001, 0x00030201,
-       0x0009, 0x00000000,
+       0x0006, 0x00000000,
+       0x0001, 0x00000040,
+       0x0001, 0x0d0c0b0a,
+       0x0001, 0x00141210,
+       0x0001, 0x000001f0,
+       0x0001, 0x00000001,
+       0x0001, 0x00000003,
        0x0001, 0x00008000,
-       0x0007, 0x00000000,
+       0x0001, 0x00000000,
+       0x0001, 0x00039e00,
+       0x0001, 0x00000040,
+       0x0001, 0x00003800,
+       0x0001, 0x00404040,
        0x0001, 0x0000ff0a,
-       0x0005, 0x00000000,
+       0x0001, 0x00000000,
        0x0001, 0x0077f005,
        0x0001, 0x00007fff,
        0x0002, 0x00000000,
-       0x0001, 0x0000000f,
-       0x0007, 0x00000000,
+       0x0001, 0x000003ff,
+       0x0002, 0x00000003,
+       0x0001, 0x000001ff,
+       0x0001, 0x0000001f,
+       0x0002, 0x0000000f,
+       0x0001, 0x00000000,
        0x0001, 0x01800000,
        0x0001, 0x00160000,
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -508,7 +640,7 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -523,23 +655,40 @@ static uint32_t nv50_ctxvals[] = {
        0x0002, 0x00000000,
        0x0001, 0x0003ffff,
        0x0005, 0x00000000,
+       0x0001, 0x00120407,
+       0x0001, 0x05091507,
+       0x0001, 0x05010202,
        0x0001, 0x00030201,
-       0x0009, 0x00000000,
+       0x0006, 0x00000000,
+       0x0001, 0x00000040,
+       0x0001, 0x0d0c0b0a,
+       0x0001, 0x00141210,
+       0x0001, 0x000001f0,
+       0x0001, 0x00000001,
+       0x0001, 0x00000003,
        0x0001, 0x00008000,
-       0x0007, 0x00000000,
+       0x0001, 0x00000000,
+       0x0001, 0x00039e00,
+       0x0001, 0x00000040,
+       0x0001, 0x00003800,
+       0x0001, 0x00404040,
        0x0001, 0x0000ff0a,
-       0x0005, 0x00000000,
+       0x0001, 0x00000000,
        0x0001, 0x0077f005,
        0x0001, 0x00007fff,
        0x0002, 0x00000000,
-       0x0001, 0x0000000f,
-       0x0007, 0x00000000,
+       0x0001, 0x000003ff,
+       0x0002, 0x00000003,
+       0x0001, 0x000001ff,
+       0x0001, 0x0000001f,
+       0x0002, 0x0000000f,
+       0x0001, 0x00000000,
        0x0001, 0x01800000,
        0x0001, 0x00160000,
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -555,7 +704,7 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -570,23 +719,40 @@ static uint32_t nv50_ctxvals[] = {
        0x0002, 0x00000000,
        0x0001, 0x0003ffff,
        0x0005, 0x00000000,
+       0x0001, 0x00120407,
+       0x0001, 0x05091507,
+       0x0001, 0x05010202,
        0x0001, 0x00030201,
-       0x0009, 0x00000000,
+       0x0006, 0x00000000,
+       0x0001, 0x00000040,
+       0x0001, 0x0d0c0b0a,
+       0x0001, 0x00141210,
+       0x0001, 0x000001f0,
+       0x0001, 0x00000001,
+       0x0001, 0x00000003,
        0x0001, 0x00008000,
-       0x0007, 0x00000000,
+       0x0001, 0x00000000,
+       0x0001, 0x00039e00,
+       0x0001, 0x00000040,
+       0x0001, 0x00003800,
+       0x0001, 0x00404040,
        0x0001, 0x0000ff0a,
-       0x0005, 0x00000000,
+       0x0001, 0x00000000,
        0x0001, 0x0077f005,
        0x0001, 0x00007fff,
        0x0002, 0x00000000,
-       0x0001, 0x0000000f,
-       0x0007, 0x00000000,
+       0x0001, 0x000003ff,
+       0x0002, 0x00000003,
+       0x0001, 0x000001ff,
+       0x0001, 0x0000001f,
+       0x0002, 0x0000000f,
+       0x0001, 0x00000000,
        0x0001, 0x01800000,
        0x0001, 0x00160000,
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -602,7 +768,7 @@ static uint32_t nv50_ctxvals[] = {
        0x0001, 0x01800000,
        0x0003, 0x00000000,
        0x0001, 0x0003ffff,
-       0x0001, 0x000c0000,
+       0x0001, 0x00080000,
        0x0008, 0x00000000,
        0x0001, 0x00010401,
        0x0001, 0x00000000,
@@ -617,17 +783,34 @@ static uint32_t nv50_ctxvals[] = {
        0x0002, 0x00000000,
        0x0001, 0x0003ffff,
        0x0005, 0x00000000,
+       0x0001, 0x00120407,
+       0x0001, 0x05091507,
+       0x0001, 0x05010202,
        0x0001, 0x00030201,
-       0x0009, 0x00000000,
+       0x0006, 0x00000000,
+       0x0001, 0x00000040,
+       0x0001, 0x0d0c0b0a,
+       0x0001, 0x00141210,
+       0x0001, 0x000001f0,
+       0x0001, 0x00000001,
+       0x0001, 0x00000003,
        0x0001, 0x00008000,
-       0x0007, 0x00000000,
+       0x0001, 0x00000000,
+       0x0001, 0x00039e00,
+       0x0001, 0x00000040,
+       0x0001, 0x00003800,
+       0x0001, 0x00404040,
        0x0001, 0x0000ff0a,
-       0x0005, 0x00000000,
+       0x0001, 0x00000000,
        0x0001, 0x0077f005,
        0x0001, 0x00007fff,
        0x0002, 0x00000000,
-       0x0001, 0x0000000f,
-       0x004c, 0x00000000,
+       0x0001, 0x000003ff,
+       0x0002, 0x00000003,
+       0x0001, 0x000001ff,
+       0x0001, 0x0000001f,
+       0x0002, 0x0000000f,
+       0x0046, 0x00000000,
        0x0004, 0x00000004,
        0x0011, 0x00000000,
        0x0001, 0x0000000f,