nouveau: Update nouveau_class.h.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>

diff --git a/nouveau/nouveau_class.h b/nouveau/nouveau_class.h
index fc71ca8..e098368 100644 (file)
--- a/nouveau/nouveau_class.h
+++ b/nouveau/nouveau_class.h
@@ -1963,11 +1963,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV10TCL_TX_FORMAT_DMA1                                                       (1 <<  1)
 #define   NV10TCL_TX_FORMAT_CUBE_MAP                                                   (1 <<  2)
 #define   NV10TCL_TX_FORMAT_FORMAT_SHIFT                                               7
-#define   NV10TCL_TX_FORMAT_FORMAT_MASK                                                        0x00000780
+#define   NV10TCL_TX_FORMAT_FORMAT_MASK                                                        0x00000f80
 #define    NV10TCL_TX_FORMAT_FORMAT_L8                                                 0x00000000
 #define    NV10TCL_TX_FORMAT_FORMAT_A8                                                 0x00000080
 #define    NV10TCL_TX_FORMAT_FORMAT_A1R5G5B5                                           0x00000100
-#define    NV10TCL_TX_FORMAT_FORMAT_A8_RECT                                            0x00000180
 #define    NV10TCL_TX_FORMAT_FORMAT_A4R4G4B4                                           0x00000200
 #define    NV10TCL_TX_FORMAT_FORMAT_R5G6B5                                             0x00000280
 #define    NV10TCL_TX_FORMAT_FORMAT_A8R8G8B8                                           0x00000300
@@ -1979,25 +1978,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV10TCL_TX_FORMAT_FORMAT_A1R5G5B5_RECT                                      0x00000800
 #define    NV10TCL_TX_FORMAT_FORMAT_R5G6B5_RECT                                                0x00000880
 #define    NV10TCL_TX_FORMAT_FORMAT_A8R8G8B8_RECT                                      0x00000900
-#define    NV10TCL_TX_FORMAT_FORMAT_L8_RECT                                            0x00000980
-#define    NV10TCL_TX_FORMAT_FORMAT_A8L8                                               0x00000d00
-#define    NV10TCL_TX_FORMAT_FORMAT_A8_RECT2                                           0x00000d80
-#define    NV10TCL_TX_FORMAT_FORMAT_A4R4G4B4_RECT                                      0x00000e80
-#define    NV10TCL_TX_FORMAT_FORMAT_R8G8B8_RECT                                                0x00000f00
-#define    NV10TCL_TX_FORMAT_FORMAT_L8A8_RECT                                          0x00001000
-#define    NV10TCL_TX_FORMAT_FORMAT_DSDT                                               0x00001400
-#define    NV10TCL_TX_FORMAT_FORMAT_A16                                                        0x00001900
-#define    NV10TCL_TX_FORMAT_FORMAT_HILO16                                             0x00001980
-#define    NV10TCL_TX_FORMAT_FORMAT_A16_RECT                                           0x00001a80
-#define    NV10TCL_TX_FORMAT_FORMAT_HILO16_RECT                                                0x00001b00
-#define    NV10TCL_TX_FORMAT_FORMAT_HILO8                                              0x00002200
-#define    NV10TCL_TX_FORMAT_FORMAT_SIGNED_HILO8                                       0x00002280
-#define    NV10TCL_TX_FORMAT_FORMAT_HILO8_RECT                                         0x00002300
-#define    NV10TCL_TX_FORMAT_FORMAT_SIGNED_HILO8_RECT                                  0x00002380
-#define    NV10TCL_TX_FORMAT_FORMAT_FLOAT_RGBA16_NV                                    0x00002500
-#define    NV10TCL_TX_FORMAT_FORMAT_FLOAT_RGBA32_NV                                    0x00002580
-#define    NV10TCL_TX_FORMAT_FORMAT_FLOAT_R32_NV                                       0x00002600
-#define   NV10TCL_TX_FORMAT_NPOT                                                       (1 << 11)
+#define    NV10TCL_TX_FORMAT_FORMAT_A8_RECT                                            0x00000980
 #define   NV10TCL_TX_FORMAT_MIPMAP                                                     (1 << 15)
 #define   NV10TCL_TX_FORMAT_BASE_SIZE_U_SHIFT                                          16
 #define   NV10TCL_TX_FORMAT_BASE_SIZE_U_MASK                                           0x000f0000
@@ -4701,7 +4682,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV20TCL_TX_FORMAT_FORMAT_L8                                                 0x00000000
 #define    NV20TCL_TX_FORMAT_FORMAT_A8                                                 0x00000100
 #define    NV20TCL_TX_FORMAT_FORMAT_A1R5G5B5                                           0x00000200
-#define    NV20TCL_TX_FORMAT_FORMAT_A8_RECT                                            0x00000300
 #define    NV20TCL_TX_FORMAT_FORMAT_A4R4G4B4                                           0x00000400
 #define    NV20TCL_TX_FORMAT_FORMAT_R5G6B5                                             0x00000500
 #define    NV20TCL_TX_FORMAT_FORMAT_A8R8G8B8                                           0x00000600
@@ -4714,20 +4694,21 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV20TCL_TX_FORMAT_FORMAT_R5G6B5_RECT                                                0x00001100
 #define    NV20TCL_TX_FORMAT_FORMAT_A8R8G8B8_RECT                                      0x00001200
 #define    NV20TCL_TX_FORMAT_FORMAT_L8_RECT                                            0x00001300
+#define    NV20TCL_TX_FORMAT_FORMAT_DSDT8_RECT                                         0x00001700
 #define    NV20TCL_TX_FORMAT_FORMAT_A8L8                                               0x00001a00
-#define    NV20TCL_TX_FORMAT_FORMAT_A8_RECT2                                           0x00001b00
+#define    NV20TCL_TX_FORMAT_FORMAT_A8_RECT                                            0x00001b00
 #define    NV20TCL_TX_FORMAT_FORMAT_A4R4G4B4_RECT                                      0x00001d00
 #define    NV20TCL_TX_FORMAT_FORMAT_R8G8B8_RECT                                                0x00001e00
-#define    NV20TCL_TX_FORMAT_FORMAT_L8A8_RECT                                          0x00002000
-#define    NV20TCL_TX_FORMAT_FORMAT_DSDT                                               0x00002800
-#define    NV20TCL_TX_FORMAT_FORMAT_A16                                                        0x00003200
+#define    NV20TCL_TX_FORMAT_FORMAT_A8L8_RECT                                          0x00002000
+#define    NV20TCL_TX_FORMAT_FORMAT_DSDT8                                              0x00002800
 #define    NV20TCL_TX_FORMAT_FORMAT_HILO16                                             0x00003300
-#define    NV20TCL_TX_FORMAT_FORMAT_A16_RECT                                           0x00003500
 #define    NV20TCL_TX_FORMAT_FORMAT_HILO16_RECT                                                0x00003600
 #define    NV20TCL_TX_FORMAT_FORMAT_HILO8                                              0x00004400
 #define    NV20TCL_TX_FORMAT_FORMAT_SIGNED_HILO8                                       0x00004500
 #define    NV20TCL_TX_FORMAT_FORMAT_HILO8_RECT                                         0x00004600
 #define    NV20TCL_TX_FORMAT_FORMAT_SIGNED_HILO8_RECT                                  0x00004700
+#define    NV20TCL_TX_FORMAT_FORMAT_A16                                                        0x00003200
+#define    NV20TCL_TX_FORMAT_FORMAT_A16_RECT                                           0x00003500
 #define    NV20TCL_TX_FORMAT_FORMAT_FLOAT_RGBA16_NV                                    0x00004a00
 #define    NV20TCL_TX_FORMAT_FORMAT_FLOAT_RGBA32_NV                                    0x00004b00
 #define    NV20TCL_TX_FORMAT_FORMAT_FLOAT_R32_NV                                       0x00004c00
@@ -4774,10 +4755,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV20TCL_TX_ENABLE_MIPMAP_MIN_LOD_SHIFT                                       26
 #define   NV20TCL_TX_ENABLE_MIPMAP_MIN_LOD_MASK                                                0x3c000000
 #define   NV20TCL_TX_ENABLE_ENABLE                                                     (1 << 30)
-#define  NV20TCL_TX_SWIZZLE(x)                                                         (0x00001b10+((x)*64))
-#define  NV20TCL_TX_SWIZZLE__SIZE                                                      0x00000004
-#define   NV20TCL_TX_SWIZZLE_RECT_PITCH_SHIFT                                          16
-#define   NV20TCL_TX_SWIZZLE_RECT_PITCH_MASK                                           0xffff0000
+#define  NV20TCL_TX_NPOT_PITCH(x)                                                      (0x00001b10+((x)*64))
+#define  NV20TCL_TX_NPOT_PITCH__SIZE                                                   0x00000004
+#define   NV20TCL_TX_NPOT_PITCH_PITCH_SHIFT                                            16
+#define   NV20TCL_TX_NPOT_PITCH_PITCH_MASK                                             0xffff0000
 #define  NV20TCL_TX_FILTER(x)                                                          (0x00001b14+((x)*64))
 #define  NV20TCL_TX_FILTER__SIZE                                                       0x00000004
 #define   NV20TCL_TX_FILTER_LOD_BIAS_SHIFT                                             8
@@ -6370,7 +6351,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_TX_FORMAT_FORMAT_L8                                                 0x00000000
 #define    NV34TCL_TX_FORMAT_FORMAT_A8                                                 0x00000100
 #define    NV34TCL_TX_FORMAT_FORMAT_A1R5G5B5                                           0x00000200
-#define    NV34TCL_TX_FORMAT_FORMAT_A8_RECT                                            0x00000300
 #define    NV34TCL_TX_FORMAT_FORMAT_A4R4G4B4                                           0x00000400
 #define    NV34TCL_TX_FORMAT_FORMAT_R5G6B5                                             0x00000500
 #define    NV34TCL_TX_FORMAT_FORMAT_A8R8G8B8                                           0x00000600
@@ -6383,20 +6363,23 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV34TCL_TX_FORMAT_FORMAT_R5G6B5_RECT                                                0x00001100
 #define    NV34TCL_TX_FORMAT_FORMAT_A8R8G8B8_RECT                                      0x00001200
 #define    NV34TCL_TX_FORMAT_FORMAT_L8_RECT                                            0x00001300
+#define    NV34TCL_TX_FORMAT_FORMAT_DSDT8_RECT                                         0x00001700
 #define    NV34TCL_TX_FORMAT_FORMAT_A8L8                                               0x00001a00
+#define    NV34TCL_TX_FORMAT_FORMAT_A8_RECT                                            0x00001b00
 #define    NV34TCL_TX_FORMAT_FORMAT_A8_RECT2                                           0x00001b00
 #define    NV34TCL_TX_FORMAT_FORMAT_A4R4G4B4_RECT                                      0x00001d00
 #define    NV34TCL_TX_FORMAT_FORMAT_R8G8B8_RECT                                                0x00001e00
 #define    NV34TCL_TX_FORMAT_FORMAT_L8A8_RECT                                          0x00002000
-#define    NV34TCL_TX_FORMAT_FORMAT_DSDT                                               0x00002800
-#define    NV34TCL_TX_FORMAT_FORMAT_A16                                                        0x00003200
+#define    NV34TCL_TX_FORMAT_FORMAT_A8L8_RECT                                          0x00002000
+#define    NV34TCL_TX_FORMAT_FORMAT_DSDT8                                              0x00002800
 #define    NV34TCL_TX_FORMAT_FORMAT_HILO16                                             0x00003300
-#define    NV34TCL_TX_FORMAT_FORMAT_A16_RECT                                           0x00003500
 #define    NV34TCL_TX_FORMAT_FORMAT_HILO16_RECT                                                0x00003600
 #define    NV34TCL_TX_FORMAT_FORMAT_HILO8                                              0x00004400
 #define    NV34TCL_TX_FORMAT_FORMAT_SIGNED_HILO8                                       0x00004500
 #define    NV34TCL_TX_FORMAT_FORMAT_HILO8_RECT                                         0x00004600
 #define    NV34TCL_TX_FORMAT_FORMAT_SIGNED_HILO8_RECT                                  0x00004700
+#define    NV34TCL_TX_FORMAT_FORMAT_A16                                                        0x00003200
+#define    NV34TCL_TX_FORMAT_FORMAT_A16_RECT                                           0x00003500
 #define    NV34TCL_TX_FORMAT_FORMAT_FLOAT_RGBA16_NV                                    0x00004a00
 #define    NV34TCL_TX_FORMAT_FORMAT_FLOAT_RGBA32_NV                                    0x00004b00
 #define    NV34TCL_TX_FORMAT_FORMAT_FLOAT_R32_NV                                       0x00004c00
@@ -7957,6 +7940,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV50TCL_CLEAR_DEPTH                                                           0x00000d90
 #define  NV50TCL_STACK_ADDRESS_HIGH                                                    0x00000d94
 #define  NV50TCL_STACK_ADDRESS_LOW                                                     0x00000d98
+#define  NV50TCL_STACK_SIZE_LOG                                                                0x00000d9c
 #define  NV50TCL_CLEAR_STENCIL                                                         0x00000da0
 #define  NV50TCL_STRMOUT_PRIMITIVE_COUNT                                               0x00000da8
 #define  NV50TCL_POLYGON_MODE_FRONT                                                    0x00000dac
@@ -7995,6 +7979,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV50TCL_CB_ADDR_BUFFER_MASK                                                  0x0000007f
 #define  NV50TCL_CB_DATA(x)                                                            (0x00000f04+((x)*4))
 #define  NV50TCL_CB_DATA__SIZE                                                         0x00000010
+#define  NV50TCL_LOCAL_WARPS_LOG_ALLOC                                                 0x00000f44
+#define  NV50TCL_LOCAL_WARPS_NO_CLAMP                                                  0x00000f48
+#define  NV50TCL_STACK_WARPS_LOG_ALLOC                                                 0x00000f4c
+#define  NV50TCL_STACK_WARPS_NO_CLAMP                                                  0x00000f50
 #define  NV50TCL_STENCIL_BACK_FUNC_REF                                                 0x00000f54
 #define  NV50TCL_STENCIL_BACK_MASK                                                     0x00000f58
 #define  NV50TCL_STENCIL_BACK_FUNC_MASK                                                        0x00000f5c
@@ -8087,8 +8075,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV50TCL_SHADE_MODEL                                                           0x000012d4
 #define   NV50TCL_SHADE_MODEL_FLAT                                                     0x00001d00
 #define   NV50TCL_SHADE_MODEL_SMOOTH                                                   0x00001d01
-#define  NV50TCL_LOCAL_BASE_HIGH                                                       0x000012d8
-#define  NV50TCL_LOCAL_BASE_LOW                                                                0x000012dc
+#define  NV50TCL_LOCAL_ADDRESS_HIGH                                                    0x000012d8
+#define  NV50TCL_LOCAL_ADDRESS_LOW                                                     0x000012dc
 #define  NV50TCL_LOCAL_SIZE_LOG                                                                0x000012e0
 #define  NV50TCL_DEPTH_WRITE_ENABLE                                                    0x000012e8
 #define  NV50TCL_ALPHA_TEST_ENABLE                                                     0x000012ec
@@ -8925,6 +8913,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV50_COMPUTE_CP_ADDRESS_LOW                                                   0x00000214
 #define  NV50_COMPUTE_STACK_ADDRESS_HIGH                                               0x00000218
 #define  NV50_COMPUTE_STACK_ADDRESS_LOW                                                        0x0000021c
+#define  NV50_COMPUTE_STACK_SIZE_LOG                                                   0x00000220
 #define  NV50_COMPUTE_TSC_ADDRESS_HIGH                                                 0x0000022c
 #define  NV50_COMPUTE_TSC_ADDRESS_LOW                                                  0x00000230
 #define  NV50_COMPUTE_TSC_LIMIT                                                                0x00000234
@@ -8938,8 +8927,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV50_COMPUTE_DELAY1                                                           0x00000284
 #define  NV50_COMPUTE_WATCHDOG_TIMER                                                   0x00000288
 #define  NV50_COMPUTE_DELAY2                                                           0x0000028c
-#define  NV50_COMPUTE_LOCAL_BASE_HIGH                                                  0x00000294
-#define  NV50_COMPUTE_LOCAL_BASE_LOW                                                   0x00000298
+#define  NV50_COMPUTE_LOCAL_ADDRESS_HIGH                                               0x00000294
+#define  NV50_COMPUTE_LOCAL_ADDRESS_LOW                                                        0x00000298
 #define  NV50_COMPUTE_LOCAL_SIZE_LOG                                                   0x0000029c
 #define  NV50_COMPUTE_CB_DEF_ADDRESS_HIGH                                              0x000002a4
 #define  NV50_COMPUTE_CB_DEF_ADDRESS_LOW                                               0x000002a8
@@ -8966,6 +8955,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV50_COMPUTE_PM_CONTROL_UNK1_MASK                                            0x00000070
 #define   NV50_COMPUTE_PM_CONTROL_UNK2_SHIFT                                           8
 #define   NV50_COMPUTE_PM_CONTROL_UNK2_MASK                                            0xffffff00
+#define  NV50_COMPUTE_LOCAL_WARPS_LOG_ALLOC                                            0x000002fc
+#define  NV50_COMPUTE_LOCAL_WARPS_NO_CLAMP                                             0x00000300
+#define  NV50_COMPUTE_STACK_WARPS_LOG_ALLOC                                            0x00000304
+#define  NV50_COMPUTE_STACK_WARPS_NO_CLAMP                                             0x00000308
 #define  NV50_COMPUTE_QUERY_ADDRESS_HIGH                                               0x00000310
 #define  NV50_COMPUTE_QUERY_ADDRESS_LOW                                                        0x00000314
 #define  NV50_COMPUTE_QUERY_COUNTER                                                    0x00000318
@@ -9021,10 +9014,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV50_COMPUTE_SET_PROGRAM_CB_BUFFER_SHIFT                                     12
 #define   NV50_COMPUTE_SET_PROGRAM_CB_BUFFER_MASK                                      0x0007f000
 #define   NV50_COMPUTE_SET_PROGRAM_CB_VALID                                            (1 <<  0)
-#define  NV50_COMPUTE_GLOBAL_BASE_HIGH(x)                                              (0x00000400+((x)*32))
-#define  NV50_COMPUTE_GLOBAL_BASE_HIGH__SIZE                                           0x00000010
-#define  NV50_COMPUTE_GLOBAL_BASE_LOW(x)                                               (0x00000404+((x)*32))
-#define  NV50_COMPUTE_GLOBAL_BASE_LOW__SIZE                                            0x00000010
+#define  NV50_COMPUTE_GLOBAL_ADDRESS_HIGH(x)                                           (0x00000400+((x)*32))
+#define  NV50_COMPUTE_GLOBAL_ADDRESS_HIGH__SIZE                                                0x00000010
+#define  NV50_COMPUTE_GLOBAL_ADDRESS_LOW(x)                                            (0x00000404+((x)*32))
+#define  NV50_COMPUTE_GLOBAL_ADDRESS_LOW__SIZE                                         0x00000010
 #define  NV50_COMPUTE_GLOBAL_PITCH(x)                                                  (0x00000408+((x)*32))
 #define  NV50_COMPUTE_GLOBAL_PITCH__SIZE                                               0x00000010
 #define  NV50_COMPUTE_GLOBAL_LIMIT(x)                                                  (0x0000040c+((x)*32))