nouveau: rename registers to their proper names.

1 files changed, 249 insertions, 244 deletions

diff --git a/shared-core/nouveau_reg.h b/shared-core/nouveau_reg.h
index 55ba43f8..c45ca87a 100644
--- a/shared-core/nouveau_reg.h
+++ b/shared-core/nouveau_reg.h
@@ -45,81 +45,82 @@
 #    define NV03_FIFO_REGS_DMAPUT(i)                       (NV03_FIFO_REGS(i)+0x40)
 #    define NV03_FIFO_REGS_DMAGET(i)                       (NV03_FIFO_REGS(i)+0x44)
 
-#define NV_PMC_BOOT_0                                      0x00000000
-#define NV_PMC_INTSTAT                                     0x00000100
-#    define NV_PMC_INTSTAT_PFIFO_PENDING                      (1<< 8)
-#    define NV_PMC_INTSTAT_PGRAPH_PENDING                     (1<<12)
-#    define NV_PMC_INTSTAT_CRTC0_PENDING                      (1<<24)
-#    define NV_PMC_INTSTAT_CRTC1_PENDING                      (1<<25)
-#    define NV_PMC_INTSTAT_CRTCn_PENDING                      (3<<24)
-#define NV_PMC_INTEN                                       0x00000140
-#    define NV_PMC_INTEN_MASTER_ENABLE                        (1<< 0)
+#define NV03_PMC_BOOT_0                                    0x00000000
+#define NV03_PMC_INTR_0                                    0x00000100
+#    define NV_PMC_INTR_0_PFIFO_PENDING                       (1<< 8)
+#    define NV_PMC_INTR_0_PGRAPH_PENDING                      (1<<12)
+#    define NV_PMC_INTR_0_CRTC0_PENDING                       (1<<24)
+#    define NV_PMC_INTR_0_CRTC1_PENDING                       (1<<25)
+#    define NV_PMC_INTR_0_CRTCn_PENDING                       (3<<24)
+#define NV03_PMC_INTR_EN_0                                 0x00000140
+#    define NV_PMC_INTR_EN_0_MASTER_ENABLE                    (1<< 0)
 
-#define NV_PGRAPH_DEBUG_4                                  0x00400090
-#define NV_PGRAPH_INTSTAT                                  0x00400100
-#define NV04_PGRAPH_INTEN                                  0x00400140
-#define NV40_PGRAPH_INTEN                                  0x0040013C
+#define NV10_PGRAPH_DEBUG_4                                0x00400090
+#define NV03_PGRAPH_INTR                                   0x00400100
+#define NV03_PGRAPH_INTR_EN                                0x00400140
+#define NV40_PGRAPH_INTR_EN                                0x0040013C
 #    define NV_PGRAPH_INTR_NOTIFY                             (1<< 0)
 #    define NV_PGRAPH_INTR_MISSING_HW                         (1<< 4)
 #    define NV_PGRAPH_INTR_CONTEXT_SWITCH                     (1<<12)
 #    define NV_PGRAPH_INTR_BUFFER_NOTIFY                      (1<<16)
 #    define NV_PGRAPH_INTR_ERROR                              (1<<20)
-#define NV_PGRAPH_CTX_CONTROL                              0x00400144
-#define NV_PGRAPH_NV40_UNK220                              0x00400220
-#    define NV_PGRAPH_NV40_UNK220_FB_INSTANCE              0xFFFFFFFF
-#define NV_PGRAPH_CTX_USER                                 0x00400148
-#define NV_PGRAPH_CTX_SWITCH1                              0x0040014C
-#define NV_PGRAPH_CTX_SWITCH2                              0x00400150
-#define NV_PGRAPH_CTX_SWITCH3                              0x00400154
-#define NV_PGRAPH_CTX_SWITCH4                              0x00400158
-#define NV_PGRAPH_CTX_SWITCH5                              0x0040015C
+#define NV03_PGRAPH_CTX_CONTROL                            0x00400144
+#define NV40_PGRAPH_UNK220                                 0x00400220
+#    define NV40_PGRAPH_UNK220_FB_INSTANCE                 0xFFFFFFFF
+#define NV03_PGRAPH_CTX_USER                               0x00400194
+#define NV04_PGRAPH_CTX_USER                               0x00400174
+#define NV10_PGRAPH_CTX_USER                               0x00400148
+#define NV10_PGRAPH_CTX_SWITCH1                            0x0040014C
+#define NV10_PGRAPH_CTX_SWITCH2                            0x00400150
+#define NV10_PGRAPH_CTX_SWITCH3                            0x00400154
+#define NV10_PGRAPH_CTX_SWITCH4                            0x00400158
+#define NV10_PGRAPH_CTX_SWITCH5                            0x0040015C
 #define NV04_PGRAPH_CTX_SWITCH1                            0x00400160
-#define NV_PGRAPH_CTX_CACHE1                               0x00400160
+#define NV10_PGRAPH_CTX_CACHE1                             0x00400160
 #define NV04_PGRAPH_CTX_SWITCH2                            0x00400164
 #define NV04_PGRAPH_CTX_SWITCH3                            0x00400168
 #define NV04_PGRAPH_CTX_SWITCH4                            0x0040016C
-#define NV04_PGRAPH_CTX_USER                               0x00400174
 #define NV04_PGRAPH_CTX_CACHE1                             0x00400180
-#define NV_PGRAPH_CTX_CACHE2                               0x00400180
+#define NV10_PGRAPH_CTX_CACHE2                             0x00400180
 #define NV04_PGRAPH_CTX_CACHE2                             0x004001A0
-#define NV_PGRAPH_CTX_CACHE3                               0x004001A0
+#define NV10_PGRAPH_CTX_CACHE3                             0x004001A0
 #define NV04_PGRAPH_CTX_CACHE3                             0x004001C0
-#define NV_PGRAPH_CTX_CACHE4                               0x004001C0
+#define NV10_PGRAPH_CTX_CACHE4                             0x004001C0
 #define NV04_PGRAPH_CTX_CACHE4                             0x004001E0
-#define NV_PGRAPH_CTX_CACHE5                               0x004001E0
-#define NV_PGRAPH_ABS_X_RAM                                0x00400400
-#define NV_PGRAPH_ABS_Y_RAM                                0x00400480
-#define NV_PGRAPH_X_MISC                                   0x00400500
-#define NV_PGRAPH_Y_MISC                                   0x00400504
-#define NV_PGRAPH_VALID1                                   0x00400508
-#define NV_PGRAPH_SOURCE_COLOR                             0x0040050C
-#define NV_PGRAPH_MISC24_0                                 0x00400510
-#define NV_PGRAPH_XY_LOGIC_MISC0                           0x00400514
-#define NV_PGRAPH_XY_LOGIC_MISC1                           0x00400518
-#define NV_PGRAPH_XY_LOGIC_MISC2                           0x0040051C
-#define NV_PGRAPH_XY_LOGIC_MISC3                           0x00400520
-#define NV_PGRAPH_CLIPX_0                                  0x00400524
-#define NV_PGRAPH_CLIPX_1                                  0x00400528
-#define NV_PGRAPH_CLIPY_0                                  0x0040052C
-#define NV_PGRAPH_CLIPY_1                                  0x00400530
-#define NV_PGRAPH_ABS_ICLIP_XMAX                           0x00400534
-#define NV_PGRAPH_ABS_ICLIP_YMAX                           0x00400538
-#define NV_PGRAPH_ABS_UCLIP_XMIN                           0x0040053C
-#define NV_PGRAPH_ABS_UCLIP_YMIN                           0x00400540
-#define NV_PGRAPH_ABS_UCLIP_XMAX                           0x00400544
-#define NV_PGRAPH_ABS_UCLIP_YMAX                           0x00400548
-#define NV_PGRAPH_ABS_UCLIPA_XMIN                          0x00400560
-#define NV_PGRAPH_ABS_UCLIPA_YMIN                          0x00400564
-#define NV_PGRAPH_ABS_UCLIPA_XMAX                          0x00400568
-#define NV_PGRAPH_ABS_UCLIPA_YMAX                          0x0040056C
-#define NV_PGRAPH_MISC24_1                                 0x00400570
-#define NV_PGRAPH_MISC24_2                                 0x00400574
-#define NV_PGRAPH_VALID2                                   0x00400578
-#define NV_PGRAPH_PASSTHRU_0                               0x0040057C
-#define NV_PGRAPH_PASSTHRU_1                               0x00400580
-#define NV_PGRAPH_PASSTHRU_2                               0x00400584
-#define NV_PGRAPH_DIMX_TEXTURE                             0x00400588
-#define NV_PGRAPH_WDIMX_TEXTURE                            0x0040058C
+#define NV10_PGRAPH_CTX_CACHE5                             0x004001E0
+#define NV03_PGRAPH_ABS_X_RAM                              0x00400400
+#define NV03_PGRAPH_ABS_Y_RAM                              0x00400480
+#define NV03_PGRAPH_X_MISC                                 0x00400500
+#define NV03_PGRAPH_Y_MISC                                 0x00400504
+#define NV04_PGRAPH_VALID1                                 0x00400508
+#define NV04_PGRAPH_SOURCE_COLOR                           0x0040050C
+#define NV04_PGRAPH_MISC24_0                               0x00400510
+#define NV03_PGRAPH_XY_LOGIC_MISC0                         0x00400514
+#define NV03_PGRAPH_XY_LOGIC_MISC1                         0x00400518
+#define NV03_PGRAPH_XY_LOGIC_MISC2                         0x0040051C
+#define NV03_PGRAPH_XY_LOGIC_MISC3                         0x00400520
+#define NV03_PGRAPH_CLIPX_0                                0x00400524
+#define NV03_PGRAPH_CLIPX_1                                0x00400528
+#define NV03_PGRAPH_CLIPY_0                                0x0040052C
+#define NV03_PGRAPH_CLIPY_1                                0x00400530
+#define NV03_PGRAPH_ABS_ICLIP_XMAX                         0x00400534
+#define NV03_PGRAPH_ABS_ICLIP_YMAX                         0x00400538
+#define NV03_PGRAPH_ABS_UCLIP_XMIN                         0x0040053C
+#define NV03_PGRAPH_ABS_UCLIP_YMIN                         0x00400540
+#define NV03_PGRAPH_ABS_UCLIP_XMAX                         0x00400544
+#define NV03_PGRAPH_ABS_UCLIP_YMAX                         0x00400548
+#define NV03_PGRAPH_ABS_UCLIPA_XMIN                        0x00400560
+#define NV03_PGRAPH_ABS_UCLIPA_YMIN                        0x00400564
+#define NV03_PGRAPH_ABS_UCLIPA_XMAX                        0x00400568
+#define NV03_PGRAPH_ABS_UCLIPA_YMAX                        0x0040056C
+#define NV04_PGRAPH_MISC24_1                               0x00400570
+#define NV04_PGRAPH_MISC24_2                               0x00400574
+#define NV04_PGRAPH_VALID2                                 0x00400578
+#define NV04_PGRAPH_PASSTHRU_0                             0x0040057C
+#define NV04_PGRAPH_PASSTHRU_1                             0x00400580
+#define NV04_PGRAPH_PASSTHRU_2                             0x00400584
+#define NV10_PGRAPH_DIMX_TEXTURE                           0x00400588
+#define NV10_PGRAPH_WDIMX_TEXTURE                          0x0040058C
 #define NV04_PGRAPH_COMBINE_0_ALPHA                        0x00400590
 #define NV04_PGRAPH_COMBINE_0_COLOR                        0x00400594
 #define NV04_PGRAPH_COMBINE_1_ALPHA                        0x00400598
@@ -128,112 +129,113 @@
 #define NV04_PGRAPH_FORMAT_1                               0x004005AC
 #define NV04_PGRAPH_FILTER_0                               0x004005B0
 #define NV04_PGRAPH_FILTER_1                               0x004005B4
-#define NV_PGRAPH_MONO_COLOR0                              0x00400600
-#define NV_PGRAPH_ROP3                                     0x00400604
-#define NV_PGRAPH_BETA_AND                                 0x00400608
-#define NV_PGRAPH_BETA_PREMULT                             0x0040060C
+#define NV03_PGRAPH_MONO_COLOR0                            0x00400600
+#define NV04_PGRAPH_ROP3                                   0x00400604
+#define NV04_PGRAPH_BETA_AND                               0x00400608
+#define NV04_PGRAPH_BETA_PREMULT                           0x0040060C
 #define NV04_PGRAPH_FORMATS                                0x00400618
-#define NV_PGRAPH_BOFFSET0                                 0x00400640
-#define NV_PGRAPH_BOFFSET1                                 0x00400644
-#define NV_PGRAPH_BOFFSET2                                 0x00400648
-#define NV_PGRAPH_BOFFSET3                                 0x0040064C
-#define NV_PGRAPH_BOFFSET4                                 0x00400650
-#define NV_PGRAPH_BOFFSET5                                 0x00400654
-#define NV_PGRAPH_BBASE0                                   0x00400658
-#define NV_PGRAPH_BBASE1                                   0x0040065C
-#define NV_PGRAPH_BBASE2                                   0x00400660
-#define NV_PGRAPH_BBASE3                                   0x00400664
-#define NV_PGRAPH_BBASE4                                   0x00400668
-#define NV_PGRAPH_BBASE5                                   0x0040066C
-#define NV_PGRAPH_BPITCH0                                  0x00400670
-#define NV_PGRAPH_BPITCH1                                  0x00400674
-#define NV_PGRAPH_BPITCH2                                  0x00400678
-#define NV_PGRAPH_BPITCH3                                  0x0040067C
-#define NV_PGRAPH_BPITCH4                                  0x00400680
-#define NV_PGRAPH_BLIMIT0                                  0x00400684
-#define NV_PGRAPH_BLIMIT1                                  0x00400688
-#define NV_PGRAPH_BLIMIT2                                  0x0040068C
-#define NV_PGRAPH_BLIMIT3                                  0x00400690
-#define NV_PGRAPH_BLIMIT4                                  0x00400694
-#define NV_PGRAPH_BLIMIT5                                  0x00400698
-#define NV_PGRAPH_BSWIZZLE2                                0x0040069C
-#define NV_PGRAPH_BSWIZZLE5                                0x004006A0
+#define NV04_PGRAPH_BOFFSET0                               0x00400640
+#define NV04_PGRAPH_BOFFSET1                               0x00400644
+#define NV04_PGRAPH_BOFFSET2                               0x00400648
+#define NV04_PGRAPH_BOFFSET3                               0x0040064C
+#define NV04_PGRAPH_BOFFSET4                               0x00400650
+#define NV04_PGRAPH_BOFFSET5                               0x00400654
+#define NV04_PGRAPH_BBASE0                                 0x00400658
+#define NV04_PGRAPH_BBASE1                                 0x0040065C
+#define NV04_PGRAPH_BBASE2                                 0x00400660
+#define NV04_PGRAPH_BBASE3                                 0x00400664
+#define NV04_PGRAPH_BBASE4                                 0x00400668
+#define NV04_PGRAPH_BBASE5                                 0x0040066C
+#define NV04_PGRAPH_BPITCH0                                0x00400670
+#define NV04_PGRAPH_BPITCH1                                0x00400674
+#define NV04_PGRAPH_BPITCH2                                0x00400678
+#define NV04_PGRAPH_BPITCH3                                0x0040067C
+#define NV04_PGRAPH_BPITCH4                                0x00400680
+#define NV04_PGRAPH_BLIMIT0                                0x00400684
+#define NV04_PGRAPH_BLIMIT1                                0x00400688
+#define NV04_PGRAPH_BLIMIT2                                0x0040068C
+#define NV04_PGRAPH_BLIMIT3                                0x00400690
+#define NV04_PGRAPH_BLIMIT4                                0x00400694
+#define NV04_PGRAPH_BLIMIT5                                0x00400698
+#define NV04_PGRAPH_BSWIZZLE2                              0x0040069C
+#define NV04_PGRAPH_BSWIZZLE5                              0x004006A0
 #define NV04_PGRAPH_SURFACE                                0x0040070C
 #define NV04_PGRAPH_STATE                                  0x00400710
-#define NV_PGRAPH_SURFACE                                  0x00400710
+#define NV10_PGRAPH_SURFACE                                0x00400710
 #define NV04_PGRAPH_NOTIFY                                 0x00400714
-#define NV_PGRAPH_STATE                                    0x00400714
-#define NV_PGRAPH_NOTIFY                                   0x00400718
+#define NV10_PGRAPH_STATE                                  0x00400714
+#define NV10_PGRAPH_NOTIFY                                 0x00400718
 
-#define NV_PGRAPH_FIFO                                     0x00400720
+#define NV04_PGRAPH_FIFO                                   0x00400720
 
-#define NV_PGRAPH_BPIXEL                                   0x00400724
-#define NV_PGRAPH_RDI_INDEX                                0x00400750
-#define NV_PGRAPH_RDI_DATA                                 0x00400754
+#define NV04_PGRAPH_BPIXEL                                 0x00400724
+#define NV10_PGRAPH_RDI_INDEX                              0x00400750
+#define NV10_PGRAPH_RDI_DATA                               0x00400754
 #define NV04_PGRAPH_DMA_PITCH                              0x00400760
-#define NV_PGRAPH_FFINTFC_ST2                              0x00400764
+#define NV10_PGRAPH_FFINTFC_ST2                            0x00400764
 #define NV04_PGRAPH_DVD_COLORFMT                           0x00400764
 #define NV04_PGRAPH_SCALED_FORMAT                          0x00400768
-#define NV_PGRAPH_DMA_PITCH                                0x00400770
-#define NV_PGRAPH_DVD_COLORFMT                             0x00400774
-#define NV_PGRAPH_SCALED_FORMAT                            0x00400778
-#define NV_PGRAPH_CHANNEL_CTX_TABLE                        0x00400780
-#define NV_PGRAPH_CHANNEL_CTX_SIZE                         0x00400784
-#define NV_PGRAPH_CHANNEL_CTX_POINTER                      0x00400788
-#define NV_PGRAPH_PATT_COLOR0                              0x00400800
-#define NV_PGRAPH_PATT_COLOR1                              0x00400804
-#define NV_PGRAPH_PATTERN                                  0x00400808
-#define NV_PGRAPH_PATTERN_SHAPE                            0x00400810
-#define NV_PGRAPH_CHROMA                                   0x00400814
+#define NV10_PGRAPH_DMA_PITCH                              0x00400770
+#define NV10_PGRAPH_DVD_COLORFMT                           0x00400774
+#define NV10_PGRAPH_SCALED_FORMAT                          0x00400778
+#define NV10_PGRAPH_CHANNEL_CTX_TABLE                      0x00400780
+#define NV10_PGRAPH_CHANNEL_CTX_SIZE                       0x00400784
+#define NV10_PGRAPH_CHANNEL_CTX_POINTER                    0x00400788
+#define NV04_PGRAPH_PATT_COLOR0                            0x00400800
+#define NV04_PGRAPH_PATT_COLOR1                            0x00400804
+#define NV04_PGRAPH_PATTERN                                0x00400808
+#define NV04_PGRAPH_PATTERN_SHAPE                          0x00400810
+#define NV04_PGRAPH_CHROMA                                 0x00400814
 #define NV04_PGRAPH_CONTROL0                               0x00400818
 #define NV04_PGRAPH_CONTROL1                               0x0040081C
 #define NV04_PGRAPH_CONTROL2                               0x00400820
 #define NV04_PGRAPH_BLEND                                  0x00400824
-#define NV_PGRAPH_STORED_FMT                               0x00400830
-#define NV_PGRAPH_PATT_COLORRAM                            0x00400900
+#define NV04_PGRAPH_STORED_FMT                             0x00400830
+#define NV04_PGRAPH_PATT_COLORRAM                          0x00400900
 #define NV04_PGRAPH_U_RAM                                  0x00400D00
 #define NV04_PGRAPH_V_RAM                                  0x00400D40
 #define NV04_PGRAPH_W_RAM                                  0x00400D80
-#define NV_PGRAPH_WINDOWCLIP_HORIZONTAL                    0x00400F00
-#define NV_PGRAPH_WINDOWCLIP_VERTICAL                      0x00400F20
-#define NV_PGRAPH_XFMODE0                                  0x00400F40
-#define NV_PGRAPH_XFMODE1                                  0x00400F44
-#define NV_PGRAPH_GLOBALSTATE0                             0x00400F48
-#define NV_PGRAPH_GLOBALSTATE1                             0x00400F4C
-#define NV_PGRAPH_PIPE_ADDRESS                             0x00400F50
-#define NV_PGRAPH_PIPE_DATA                                0x00400F54
-#define NV_PGRAPH_DMA_START_0                              0x00401000
-#define NV_PGRAPH_DMA_START_1                              0x00401004
-#define NV_PGRAPH_DMA_LENGTH                               0x00401008
-#define NV_PGRAPH_DMA_MISC                                 0x0040100C
-#define NV_PGRAPH_DMA_DATA_0                               0x00401020
-#define NV_PGRAPH_DMA_DATA_1                               0x00401024
-#define NV_PGRAPH_DMA_RM                                   0x00401030
-#define NV_PGRAPH_DMA_A_XLATE_INST                         0x00401040
-#define NV_PGRAPH_DMA_A_CONTROL                            0x00401044
-#define NV_PGRAPH_DMA_A_LIMIT                              0x00401048
-#define NV_PGRAPH_DMA_A_TLB_PTE                            0x0040104C
-#define NV_PGRAPH_DMA_A_TLB_TAG                            0x00401050
-#define NV_PGRAPH_DMA_A_ADJ_OFFSET                         0x00401054
-#define NV_PGRAPH_DMA_A_OFFSET                             0x00401058
-#define NV_PGRAPH_DMA_A_SIZE                               0x0040105C
-#define NV_PGRAPH_DMA_A_Y_SIZE                             0x00401060
-#define NV_PGRAPH_DMA_B_XLATE_INST                         0x00401080
-#define NV_PGRAPH_DMA_B_CONTROL                            0x00401084
-#define NV_PGRAPH_DMA_B_LIMIT                              0x00401088
-#define NV_PGRAPH_DMA_B_TLB_PTE                            0x0040108C
-#define NV_PGRAPH_DMA_B_TLB_TAG                            0x00401090
-#define NV_PGRAPH_DMA_B_ADJ_OFFSET                         0x00401094
-#define NV_PGRAPH_DMA_B_OFFSET                             0x00401098
-#define NV_PGRAPH_DMA_B_SIZE                               0x0040109C
-#define NV_PGRAPH_DMA_B_Y_SIZE                             0x004010A0
+#define NV10_PGRAPH_WINDOWCLIP_HORIZONTAL                  0x00400F00
+#define NV10_PGRAPH_WINDOWCLIP_VERTICAL                    0x00400F20
+#define NV10_PGRAPH_XFMODE0                                0x00400F40
+#define NV10_PGRAPH_XFMODE1                                0x00400F44
+#define NV10_PGRAPH_GLOBALSTATE0                           0x00400F48
+#define NV10_PGRAPH_GLOBALSTATE1                           0x00400F4C
+#define NV10_PGRAPH_PIPE_ADDRESS                           0x00400F50
+#define NV10_PGRAPH_PIPE_DATA                              0x00400F54
+#define NV04_PGRAPH_DMA_START_0                            0x00401000
+#define NV04_PGRAPH_DMA_START_1                            0x00401004
+#define NV04_PGRAPH_DMA_LENGTH                             0x00401008
+#define NV04_PGRAPH_DMA_MISC                               0x0040100C
+#define NV04_PGRAPH_DMA_DATA_0                             0x00401020
+#define NV04_PGRAPH_DMA_DATA_1                             0x00401024
+#define NV04_PGRAPH_DMA_RM                                 0x00401030
+#define NV04_PGRAPH_DMA_A_XLATE_INST                       0x00401040
+#define NV04_PGRAPH_DMA_A_CONTROL                          0x00401044
+#define NV04_PGRAPH_DMA_A_LIMIT                            0x00401048
+#define NV04_PGRAPH_DMA_A_TLB_PTE                          0x0040104C
+#define NV04_PGRAPH_DMA_A_TLB_TAG                          0x00401050
+#define NV04_PGRAPH_DMA_A_ADJ_OFFSET                       0x00401054
+#define NV04_PGRAPH_DMA_A_OFFSET                           0x00401058
+#define NV04_PGRAPH_DMA_A_SIZE                             0x0040105C
+#define NV04_PGRAPH_DMA_A_Y_SIZE                           0x00401060
+#define NV04_PGRAPH_DMA_B_XLATE_INST                       0x00401080
+#define NV04_PGRAPH_DMA_B_CONTROL                          0x00401084
+#define NV04_PGRAPH_DMA_B_LIMIT                            0x00401088
+#define NV04_PGRAPH_DMA_B_TLB_PTE                          0x0040108C
+#define NV04_PGRAPH_DMA_B_TLB_TAG                          0x00401090
+#define NV04_PGRAPH_DMA_B_ADJ_OFFSET                       0x00401094
+#define NV04_PGRAPH_DMA_B_OFFSET                           0x00401098
+#define NV04_PGRAPH_DMA_B_SIZE                             0x0040109C
+#define NV04_PGRAPH_DMA_B_Y_SIZE                           0x004010A0
 
 
 /* It's a guess that this works on NV03. Confirmed on NV04, though */
-#define NV_PFIFO_DELAY_0                                   0x00002040
-#define NV_PFIFO_DMA_TIMESLICE                             0x00002044
-#define NV_PFIFO_INTSTAT                                   0x00002100
-#define NV_PFIFO_INTEN                                     0x00002140
+#define NV04_PFIFO_DELAY_0                                 0x00002040
+#define NV04_PFIFO_DMA_TIMESLICE                           0x00002044
+#define NV04_PFIFO_NEXT_CHANNEL                            0x00002050
+#define NV03_PFIFO_INTR_0                                  0x00002100
+#define NV03_PFIFO_INTR_EN_0                               0x00002140
 #    define NV_PFIFO_INTR_CACHE_ERROR                         (1<< 0)
 #    define NV_PFIFO_INTR_RUNOUT                              (1<< 4)
 #    define NV_PFIFO_INTR_RUNOUT_OVERFLOW                     (1<< 8)
@@ -241,105 +243,108 @@
 #    define NV_PFIFO_INTR_DMA_PT                              (1<<16)
 #    define NV_PFIFO_INTR_SEMAPHORE                           (1<<20)
 #    define NV_PFIFO_INTR_ACQUIRE_TIMEOUT                     (1<<24)
-#define NV_PFIFO_RAMHT                                     0x00002210
-#define NV_PFIFO_RAMFC                                     0x00002214
-#define NV_PFIFO_RAMRO                                     0x00002218
+#define NV03_PFIFO_RAMHT                                   0x00002210
+#define NV03_PFIFO_RAMFC                                   0x00002214
+#define NV03_PFIFO_RAMRO                                   0x00002218
 #define NV40_PFIFO_RAMFC                                   0x00002220
-#define NV_PFIFO_CACHES                                    0x00002500
-#define NV_PFIFO_MODE                                      0x00002504
-#define NV_PFIFO_DMA                                       0x00002508
-#define NV_PFIFO_SIZE                                      0x0000250c
-#define NV_PFIFO_CACH0_PSH0                                0x00003000
-#define NV_PFIFO_CACH0_PUL0                                0x00003050
-#define NV_PFIFO_CACH0_PUL1                                0x00003054
-#define NV_PFIFO_CACH1_PSH0                                0x00003200
-#define NV_PFIFO_CACH1_PSH1                                0x00003204
-#define NV_PFIFO_CACH1_DMAPSH                              0x00003220
-#define NV_PFIFO_CACH1_DMAF                                0x00003224
-#    define NV_PFIFO_CACH1_DMAF_TRIG_8_BYTES               0x00000000
-#    define NV_PFIFO_CACH1_DMAF_TRIG_16_BYTES              0x00000008
-#    define NV_PFIFO_CACH1_DMAF_TRIG_24_BYTES              0x00000010
-#    define NV_PFIFO_CACH1_DMAF_TRIG_32_BYTES              0x00000018
-#    define NV_PFIFO_CACH1_DMAF_TRIG_40_BYTES              0x00000020
-#    define NV_PFIFO_CACH1_DMAF_TRIG_48_BYTES              0x00000028
-#    define NV_PFIFO_CACH1_DMAF_TRIG_56_BYTES              0x00000030
-#    define NV_PFIFO_CACH1_DMAF_TRIG_64_BYTES              0x00000038
-#    define NV_PFIFO_CACH1_DMAF_TRIG_72_BYTES              0x00000040
-#    define NV_PFIFO_CACH1_DMAF_TRIG_80_BYTES              0x00000048
-#    define NV_PFIFO_CACH1_DMAF_TRIG_88_BYTES              0x00000050
-#    define NV_PFIFO_CACH1_DMAF_TRIG_96_BYTES              0x00000058
-#    define NV_PFIFO_CACH1_DMAF_TRIG_104_BYTES             0x00000060
-#    define NV_PFIFO_CACH1_DMAF_TRIG_112_BYTES             0x00000068
-#    define NV_PFIFO_CACH1_DMAF_TRIG_120_BYTES             0x00000070
-#    define NV_PFIFO_CACH1_DMAF_TRIG_128_BYTES             0x00000078
-#    define NV_PFIFO_CACH1_DMAF_TRIG_136_BYTES             0x00000080
-#    define NV_PFIFO_CACH1_DMAF_TRIG_144_BYTES             0x00000088
-#    define NV_PFIFO_CACH1_DMAF_TRIG_152_BYTES             0x00000090
-#    define NV_PFIFO_CACH1_DMAF_TRIG_160_BYTES             0x00000098
-#    define NV_PFIFO_CACH1_DMAF_TRIG_168_BYTES             0x000000A0
-#    define NV_PFIFO_CACH1_DMAF_TRIG_176_BYTES             0x000000A8
-#    define NV_PFIFO_CACH1_DMAF_TRIG_184_BYTES             0x000000B0
-#    define NV_PFIFO_CACH1_DMAF_TRIG_192_BYTES             0x000000B8
-#    define NV_PFIFO_CACH1_DMAF_TRIG_200_BYTES             0x000000C0
-#    define NV_PFIFO_CACH1_DMAF_TRIG_208_BYTES             0x000000C8
-#    define NV_PFIFO_CACH1_DMAF_TRIG_216_BYTES             0x000000D0
-#    define NV_PFIFO_CACH1_DMAF_TRIG_224_BYTES             0x000000D8
-#    define NV_PFIFO_CACH1_DMAF_TRIG_232_BYTES             0x000000E0
-#    define NV_PFIFO_CACH1_DMAF_TRIG_240_BYTES             0x000000E8
-#    define NV_PFIFO_CACH1_DMAF_TRIG_248_BYTES             0x000000F0
-#    define NV_PFIFO_CACH1_DMAF_TRIG_256_BYTES             0x000000F8
-#    define NV_PFIFO_CACH1_DMAF_SIZE                       0x0000E000
-#    define NV_PFIFO_CACH1_DMAF_SIZE_32_BYTES              0x00000000
-#    define NV_PFIFO_CACH1_DMAF_SIZE_64_BYTES              0x00002000
-#    define NV_PFIFO_CACH1_DMAF_SIZE_96_BYTES              0x00004000
-#    define NV_PFIFO_CACH1_DMAF_SIZE_128_BYTES             0x00006000
-#    define NV_PFIFO_CACH1_DMAF_SIZE_160_BYTES             0x00008000
-#    define NV_PFIFO_CACH1_DMAF_SIZE_192_BYTES             0x0000A000
-#    define NV_PFIFO_CACH1_DMAF_SIZE_224_BYTES             0x0000C000
-#    define NV_PFIFO_CACH1_DMAF_SIZE_256_BYTES             0x0000E000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS                   0x001F0000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_0                 0x00000000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_1                 0x00010000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_2                 0x00020000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_3                 0x00030000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_4                 0x00040000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_5                 0x00050000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_6                 0x00060000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_7                 0x00070000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_8                 0x00080000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_9                 0x00090000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_10                0x000A0000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_11                0x000B0000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_12                0x000C0000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_13                0x000D0000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_14                0x000E0000
-#    define NV_PFIFO_CACH1_DMAF_MAX_REQS_15                0x000F0000
-#    define NV_PFIFO_CACH1_ENDIAN                          0x80000000
-#    define NV_PFIFO_CACH1_LITTLE_ENDIAN                   0x7FFFFFFF
-#    define NV_PFIFO_CACH1_BIG_ENDIAN                      0x80000000
-#define NV_PFIFO_CACH1_DMAS                                0x00003228
-#define NV_PFIFO_CACH1_DMAI                                0x0000322c
-#define NV_PFIFO_CACH1_DMAC                                0x00003230
-#define NV_PFIFO_CACH1_DMAP                                0x00003240
-#define NV_PFIFO_CACH1_DMAG                                0x00003244
-#define NV_PFIFO_CACH1_REF_CNT                             0x00003248
-#define NV_PFIFO_CACH1_DMASR                               0x0000324C
-#define NV_PFIFO_CACH1_PUL0                                0x00003250
-#define NV_PFIFO_CACH1_PUL1                                0x00003254
-#define NV_PFIFO_CACH1_HASH                                0x00003258
-#define NV_PFIFO_CACH1_ACQUIRE_TIMEOUT                     0x00003260
-#define NV_PFIFO_CACH1_ACQUIRE_TIMESTAMP                   0x00003264
-#define NV_PFIFO_CACH1_ACQUIRE_VALUE                       0x00003268
-#define NV_PFIFO_CACH1_SEMAPHORE                           0x0000326C
-#define NV_PFIFO_CACH1_GET                                 0x00003270
-#define NV_PFIFO_CACH1_ENG                                 0x00003280
-#define NV_PFIFO_CACH1_DMA_DCOUNT                          0x000032A0
+#define NV03_PFIFO_CACHES                                  0x00002500
+#define NV04_PFIFO_MODE                                    0x00002504
+#define NV04_PFIFO_DMA                                     0x00002508
+#define NV04_PFIFO_SIZE                                    0x0000250c
+#define NV03_PFIFO_CACHE0_PUSH0                            0x00003000
+#define NV03_PFIFO_CACHE0_PULL0                            0x00003040
+#define NV04_PFIFO_CACHE0_PULL0                            0x00003050
+#define NV04_PFIFO_CACHE0_PULL1                            0x00003054
+#define NV03_PFIFO_CACHE1_PUSH0                            0x00003200
+#define NV03_PFIFO_CACHE1_PUSH1                            0x00003204
+#define NV04_PFIFO_CACHE1_DMA_PUSH                         0x00003220
+#define NV04_PFIFO_CACHE1_DMA_FETCH                        0x00003224
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_8_BYTES         0x00000000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_16_BYTES        0x00000008
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_24_BYTES        0x00000010
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_32_BYTES        0x00000018
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_40_BYTES        0x00000020
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_48_BYTES        0x00000028
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_56_BYTES        0x00000030
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_64_BYTES        0x00000038
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_72_BYTES        0x00000040
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_80_BYTES        0x00000048
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_88_BYTES        0x00000050
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_96_BYTES        0x00000058
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_104_BYTES       0x00000060
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_112_BYTES       0x00000068
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_120_BYTES       0x00000070
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_128_BYTES       0x00000078
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_136_BYTES       0x00000080
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_144_BYTES       0x00000088
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_152_BYTES       0x00000090
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_160_BYTES       0x00000098
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_168_BYTES       0x000000A0
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_176_BYTES       0x000000A8
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_184_BYTES       0x000000B0
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_192_BYTES       0x000000B8
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_200_BYTES       0x000000C0
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_208_BYTES       0x000000C8
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_216_BYTES       0x000000D0
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_224_BYTES       0x000000D8
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_232_BYTES       0x000000E0
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_240_BYTES       0x000000E8
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_248_BYTES       0x000000F0
+#    define NV_PFIFO_CACHE1_DMA_FETCH_TRIG_256_BYTES       0x000000F8
+#    define NV_PFIFO_CACHE1_DMA_FETCH_SIZE                 0x0000E000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_32_BYTES        0x00000000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_64_BYTES        0x00002000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_96_BYTES        0x00004000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES       0x00006000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_160_BYTES       0x00008000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_192_BYTES       0x0000A000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_224_BYTES       0x0000C000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_SIZE_256_BYTES       0x0000E000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS             0x001F0000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_0           0x00000000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_1           0x00010000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_2           0x00020000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_3           0x00030000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_4           0x00040000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_5           0x00050000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_6           0x00060000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_7           0x00070000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_8           0x00080000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_9           0x00090000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_10          0x000A0000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_11          0x000B0000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_12          0x000C0000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_13          0x000D0000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_14          0x000E0000
+#    define NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_15          0x000F0000
+#    define NV_PFIFO_CACHE1_ENDIAN                         0x80000000
+#    define NV_PFIFO_CACHE1_LITTLE_ENDIAN                  0x7FFFFFFF
+#    define NV_PFIFO_CACHE1_BIG_ENDIAN                     0x80000000
+#define NV04_PFIFO_CACHE1_DMA_STATE                        0x00003228
+#define NV04_PFIFO_CACHE1_DMA_INSTANCE                     0x0000322c
+#define NV04_PFIFO_CACHE1_DMA_CTL                          0x00003230
+#define NV04_PFIFO_CACHE1_DMA_PUT                          0x00003240
+#define NV04_PFIFO_CACHE1_DMA_GET                          0x00003244
+#define NV10_PFIFO_CACHE1_REF_CNT                          0x00003248
+#define NV10_PFIFO_CACHE1_DMA_SUBROUTINE                   0x0000324C
+#define NV03_PFIFO_CACHE1_PULL0                            0x00003240
+#define NV04_PFIFO_CACHE1_PULL0                            0x00003250
+#define NV03_PFIFO_CACHE1_PULL1                            0x00003250
+#define NV04_PFIFO_CACHE1_PULL1                            0x00003254
+#define NV04_PFIFO_CACHE1_HASH                             0x00003258
+#define NV10_PFIFO_CACHE1_ACQUIRE_TIMEOUT                  0x00003260
+#define NV10_PFIFO_CACHE1_ACQUIRE_TIMESTAMP                0x00003264
+#define NV10_PFIFO_CACHE1_ACQUIRE_VALUE                    0x00003268
+#define NV10_PFIFO_CACHE1_SEMAPHORE                        0x0000326C
+#define NV03_PFIFO_CACHE1_GET                              0x00003270
+#define NV04_PFIFO_CACHE1_ENGINE                           0x00003280
+#define NV10_PFIFO_CACHE1_DMA_DCOUNT                       0x000032A0
 #define NV40_PFIFO_GRCTX_INSTANCE                          0x000032E0
 #define NV40_PFIFO_UNK32E4                                 0x000032E4
-#define NV_PFIFO_CACH1_METHOD(i)                   (0x00003800+(i*8))
-#define NV_PFIFO_CACH1_DATA(i)                     (0x00003804+(i*8))
-#define NV40_PFIFO_CACH1_METHOD(i)                 (0x00090000+(i*8))
-#define NV40_PFIFO_CACH1_DATA(i)                   (0x00090004+(i*8))
+#define NV04_PFIFO_CACHE1_METHOD(i)                (0x00003800+(i*8))
+#define NV04_PFIFO_CACHE1_DATA(i)                  (0x00003804+(i*8))
+#define NV40_PFIFO_CACHE1_METHOD(i)                (0x00090000+(i*8))
+#define NV40_PFIFO_CACHE1_DATA(i)                  (0x00090004+(i*8))
 
 #define NV_CRTC0_INTSTAT                                   0x00600100
 #define NV_CRTC0_INTEN                                     0x00600140