nouveau: latest header.

diff --git a/src/gallium/drivers/nouveau/nouveau_class.h b/src/gallium/drivers/nouveau/nouveau_class.h
index 7392490df01f83e5c0525b68396669df098d10ad..dc202086d2c6bfe9063eff9303deb49339ab0c1b 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_class.h
+++ b/src/gallium/drivers/nouveau/nouveau_class.h
@@ -1784,6 +1784,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV10TCL_TX_OFFSET__SIZE                                                       0x00000002
 #define  NV10TCL_TX_FORMAT(x)                                                          (0x00000220+((x)*4))
 #define  NV10TCL_TX_FORMAT__SIZE                                                       0x00000002
+#define   NV10TCL_TX_FORMAT_DMA0                                                       (1 <<  0)
+#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
@@ -5360,12 +5362,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV50_2D_RECT_Y1                                                               0x00000604
 #define  NV50_2D_RECT_X2                                                               0x00000608
 #define  NV50_2D_RECT_Y2                                                               0x0000060c
-#define  NV50_2D_BLIT_DST_X                                                            0x000008b0
-#define  NV50_2D_BLIT_DST_Y                                                            0x000008b4
-#define  NV50_2D_BLIT_DST_W                                                            0x000008b8
-#define  NV50_2D_BLIT_DST_H                                                            0x000008bc
-#define  NV50_2D_BLIT_SRC_X                                                            0x000008d4
-#define  NV50_2D_BLIT_SRC_Y                                                            0x000008dc
 #define  NV50_2D_SIFC_UNK0800                                                          0x00000800
 #define  NV50_2D_SIFC_FORMAT                                                           0x00000804
 #define   NV50_2D_SIFC_FORMAT_32BPP                                                    0x000000cf
@@ -5384,6 +5380,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV50_2D_SIFC_UNK0858                                                          0x00000858
 #define  NV50_2D_SIFC_DST_Y                                                            0x0000085c
 #define  NV50_2D_SIFC_DATA                                                             0x00000860
+#define  NV50_2D_BLIT_DST_X                                                            0x000008b0
+#define  NV50_2D_BLIT_DST_Y                                                            0x000008b4
+#define  NV50_2D_BLIT_DST_W                                                            0x000008b8
+#define  NV50_2D_BLIT_DST_H                                                            0x000008bc
+#define  NV50_2D_BLIT_SRC_X                                                            0x000008d4
+#define  NV50_2D_BLIT_SRC_Y                                                            0x000008dc
 
 
 #define NV50_MEMORY_TO_MEMORY_FORMAT                                                   0x00005039