nouveau: switch to libdrm_nouveau-2.0

1 files changed, 175 insertions, 145 deletions

diff --git a/src/gallium/drivers/nouveau/nv_object.xml.h b/src/gallium/drivers/nouveau/nv_object.xml.h
index 47dc6751041..d87d7139bf3 100644
--- a/src/gallium/drivers/nouveau/nv_object.xml.h
+++ b/src/gallium/drivers/nouveau/nv_object.xml.h
@@ -1,5 +1,10 @@
-#ifndef NV_OBJECT_XML
-#define NV_OBJECT_XML
+#ifndef RNNDB_NV_OBJECT_XML
+#define RNNDB_NV_OBJECT_XML
+
+/* WARNING ABOUT NOT EDITING AUTOGENERATED FILE IGNORED, _CLASS SUFFIX HAS
+ * BEEN ADDED TO ALL THE OBJECT CLASS DEFINITIONS TO AVOID CONFLICTS WITH
+ * THE RING MACROS WE WANT TO USE
+ */
 
 /* Autogenerated file, DO NOT EDIT manually!
 
@@ -8,12 +13,13 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
 git clone git://0x04.net/rules-ng-ng
 
 The rules-ng-ng source files this header was generated from are:
-- nv_object.xml  (  11547 bytes, from 2010-10-24 15:29:34)
-- copyright.xml  (   6498 bytes, from 2010-10-03 13:18:37)
-- nvchipsets.xml (   2907 bytes, from 2010-10-15 16:28:21)
-- nv_defs.xml    (   4437 bytes, from 2010-07-06 07:43:58)
+- rnndb/nv_object.xml    (  12672 bytes, from 2011-07-17 12:14:32)
+- ./rnndb/copyright.xml  (   6452 bytes, from 2011-07-09 13:43:58)
+- ./rnndb/nvchipsets.xml (   3701 bytes, from 2012-04-06 13:21:15)
+- ./rnndb/nv_defs.xml    (   4437 bytes, from 2011-07-09 13:43:58)
+- ./rnndb/nv50_defs.xml  (   5468 bytes, from 2011-07-09 13:43:58)
 
-Copyright (C) 2006-2010 by the following authors:
+Copyright (C) 2006-2011 by the following authors:
 - Artur Huillet <[email protected]> (ahuillet)
 - Ben Skeggs (darktama, darktama_)
 - B. R. <[email protected]> (koala_br)
@@ -24,7 +30,7 @@ Copyright (C) 2006-2010 by the following authors:
 - Dmitry Eremin-Solenikov <[email protected]> (lumag)
 - EdB <[email protected]> (edb_)
 - Erik Waling <[email protected]> (erikwaling)
-- Francisco Jerez <[email protected]> (curro, curro_, currojerez)
+- Francisco Jerez <[email protected]> (curro)
 - imirkin <[email protected]> (imirkin)
 - jb17bsome <[email protected]> (jb17bsome)
 - Jeremy Kolb <[email protected]> (kjeremy)
@@ -72,114 +78,129 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 
-#define NV01_ROOT						0x00000001
-#define NV01_CONTEXT_DMA					0x00000002
-#define NV01_DEVICE						0x00000003
-#define NV01_TIMER						0x00000004
-#define NV01_NULL						0x00000030
-#define NV01_MEMORY_LOCAL_BANKED				0x0000003d
-#define NV01_MAPPING_SYSTEM					0x0000003e
-#define NV03_MEMORY_LOCAL_CURSOR				0x0000003f
-#define NV01_MEMORY_LOCAL_LINEAR				0x00000040
-#define NV01_MAPPING_LOCAL					0x00000041
-#define NV03_VIDEO_LUT_CURSOR_DAC				0x00000046
-#define NV03_CHANNEL_PIO					0x0000006a
-#define NV03_CHANNEL_DMA					0x0000006b
-#define NV10_VIDEO_DISPLAY					0x0000007c
-#define NV01_CONTEXT_BETA1					0x00000012
-#define NV04_BETA_SOLID						0x00000072
-#define NV01_CONTEXT_COLOR_KEY					0x00000017
-#define NV04_CONTEXT_COLOR_KEY					0x00000057
-#define NV01_CONTEXT_PATTERN					0x00000018
-#define NV01_CONTEXT_CLIP_RECTANGLE				0x00000019
-#define NV03_CONTEXT_ROP					0x00000043
-#define NV04_IMAGE_PATTERN					0x00000044
-#define NV01_RENDER_SOLID_LINE					0x0000001c
-#define NV04_RENDER_SOLID_LINE					0x0000005c
-#define NV30_RENDER_SOLID_LINE					0x0000035c
-#define NV40_RENDER_SOLID_LINE					0x0000305c
-#define NV01_RENDER_SOLID_TRIANGLE				0x0000001d
-#define NV04_RENDER_SOLID_TRIANGLE				0x0000005d
-#define NV01_RENDER_SOLID_RECTANGLE				0x0000001e
-#define NV04_RENDER_SOLID_RECTANGLE				0x0000005e
-#define NV01_IMAGE_BLIT						0x0000001f
-#define NV04_IMAGE_BLIT						0x0000005f
-#define NV11_IMAGE_BLIT						0x0000009f
-#define NV01_IMAGE_FROM_CPU					0x00000021
-#define NV04_IMAGE_FROM_CPU					0x00000061
-#define NV05_IMAGE_FROM_CPU					0x00000065
-#define NV10_IMAGE_FROM_CPU					0x0000008a
-#define NV30_IMAGE_FROM_CPU					0x0000038a
-#define NV40_IMAGE_FROM_CPU					0x0000308a
-#define NV03_STRETCHED_IMAGE_FROM_CPU				0x00000036
-#define NV04_STRETCHED_IMAGE_FROM_CPU				0x00000076
-#define NV05_STRETCHED_IMAGE_FROM_CPU				0x00000066
-#define NV30_STRETCHED_IMAGE_FROM_CPU				0x00000366
-#define NV40_STRETCHED_IMAGE_FROM_CPU				0x00003066
-#define NV03_SCALED_IMAGE_FROM_MEMORY				0x00000037
-#define NV04_SCALED_IMAGE_FROM_MEMORY				0x00000077
-#define NV05_SCALED_IMAGE_FROM_MEMORY				0x00000063
-#define NV10_SCALED_IMAGE_FROM_MEMORY				0x00000089
-#define NV30_SCALED_IMAGE_FROM_MEMORY				0x00000389
-#define NV40_SCALED_IMAGE_FROM_MEMORY				0x00003089
-#define NV50_SCALED_IMAGE_FROM_MEMORY				0x00005089
-#define NV04_DVD_SUBPICTURE					0x00000038
-#define NV10_DVD_SUBPICTURE					0x00000088
-#define NV03_GDI_RECTANGLE_TEXT					0x0000004b
-#define NV04_GDI_RECTANGLE_TEXT					0x0000004a
-#define NV04_SWIZZLED_SURFACE					0x00000052
-#define NV11_SWIZZLED_SURFACE					0x0000009e
-#define NV30_SWIZZLED_SURFACE					0x0000039e
-#define NV40_SWIZZLED_SURFACE					0x0000309e
-#define NV03_CONTEXT_SURFACE_DST				0x00000058
-#define NV03_CONTEXT_SURFACE_SRC				0x00000059
-#define NV04_CONTEXT_SURFACES_2D				0x00000042
-#define NV10_CONTEXT_SURFACES_2D				0x00000062
-#define NV30_CONTEXT_SURFACES_2D				0x00000362
-#define NV40_CONTEXT_SURFACES_2D				0x00003062
-#define NV50_CONTEXT_SURFACES_2D				0x00005062
-#define NV04_INDEXED_IMAGE_FROM_CPU				0x00000060
-#define NV05_INDEXED_IMAGE_FROM_CPU				0x00000064
-#define NV30_INDEXED_IMAGE_FROM_CPU				0x00000364
-#define NV40_INDEXED_IMAGE_FROM_CPU				0x00003064
-#define NV10_TEXTURE_FROM_CPU					0x0000007b
-#define NV30_TEXTURE_FROM_CPU					0x0000037b
-#define NV40_TEXTURE_FROM_CPU					0x0000307b
-#define NV04_M2MF						0x00000039
-#define NV50_M2MF						0x00005039
-#define NVC0_M2MF						0x00009039
-#define NV03_TEXTURED_TRIANGLE					0x00000048
-#define NV04_TEXTURED_TRIANGLE					0x00000054
-#define NV10_TEXTURED_TRIANGLE					0x00000094
-#define NV04_MULTITEX_TRIANGLE					0x00000055
-#define NV10_MULTITEX_TRIANGLE					0x00000095
-#define NV03_CONTEXT_SURFACE_COLOR				0x0000005a
-#define NV03_CONTEXT_SURFACE_ZETA				0x0000005b
-#define NV04_CONTEXT_SURFACES_3D				0x00000053
-#define NV10_CONTEXT_SURFACES_3D				0x00000093
-#define NV10_3D							0x00000056
-#define NV11_3D							0x00000096
-#define NV17_3D							0x00000099
-#define NV20_3D							0x00000097
-#define NV25_3D							0x00000597
-#define NV30_3D							0x00000397
-#define NV35_3D							0x00000497
-#define NV34_3D							0x00000697
-#define NV40_3D							0x00004097
-#define NV44_3D							0x00004497
-#define NV50_3D							0x00005097
-#define NV84_3D							0x00008297
-#define NVA0_3D							0x00008397
-#define NVA3_3D							0x00008597
-#define NVAF_3D							0x00008697
-#define NVC0_3D							0x00009097
-#define NV50_2D							0x0000502d
-#define NVC0_2D							0x0000902d
-#define NV50_COMPUTE						0x000050c0
-#define NVA3_COMPUTE						0x000085c0
-#define NVC0_COMPUTE						0x000090c0
-#define NV84_CRYPT						0x000074c1
-#define NV01_SUBCHAN__SIZE					0x00002000
+#define NV01_DMA_FROM_MEMORY_CLASS				0x00000002
+#define NV01_DMA_TO_MEMORY_CLASS				0x00000003
+#define NV01_NULL_CLASS						0x00000030
+#define NV03_DMA_IN_MEMORY_CLASS				0x0000003d
+#define NV01_OP_CLIP_CLASS					0x00000010
+#define NV01_OP_BLEND_AND_CLASS					0x00000011
+#define NV01_BETA_CLASS						0x00000012
+#define NV04_BETA4_CLASS					0x00000072
+#define NV01_OP_ROP_AND_CLASS					0x00000013
+#define NV01_ROP_CLASS						0x00000014
+#define NV03_ROP_CLASS						0x00000043
+#define NV01_OP_CHROMA_CLASS					0x00000015
+#define NV01_OP_PLANE_SWITCH_CLASS				0x00000016
+#define NV01_CHROMA_CLASS					0x00000017
+#define NV04_CHROMA_CLASS					0x00000057
+#define NV01_PATTERN_CLASS					0x00000018
+#define NV04_PATTERN_CLASS					0x00000044
+#define NV01_CLIP_CLASS						0x00000019
+#define NV01_OP_SRCCOPY_AND_CLASS				0x00000064
+#define NV03_OP_SRCCOPY_CLASS					0x00000065
+#define NV04_OP_SRCCOPY_PREMULT_CLASS				0x00000066
+#define NV04_OP_BLEND_PREMULT_CLASS				0x00000067
+#define NV01_POINT_CLASS					0x0000001a
+#define NV01_LINE_CLASS						0x0000001b
+#define NV01_LIN_CLASS						0x0000001c
+#define NV04_LIN_CLASS						0x0000005c
+#define NV30_LIN_CLASS						0x0000035c
+#define NV40_LIN_CLASS						0x0000305c
+#define NV01_TRI_CLASS						0x0000001d
+#define NV04_TRI_CLASS						0x0000005d
+#define NV01_RECT_CLASS						0x0000001e
+#define NV04_RECT_CLASS						0x0000005e
+#define NV01_BLIT_CLASS						0x0000001f
+#define NV04_BLIT_CLASS						0x0000005f
+#define NV15_BLIT_CLASS						0x0000009f
+#define NV01_IFROMMEM_CLASS					0x00000020
+#define NV01_IFC_CLASS						0x00000021
+#define NV04_IFC_CLASS						0x00000061
+#define NV05_IFC_CLASS						0x00000065
+#define NV10_IFC_CLASS						0x0000008a
+#define NV30_IFC_CLASS						0x0000038a
+#define NV40_IFC_CLASS						0x0000308a
+#define NV01_BITMAP_CLASS					0x00000022
+#define NV01_ITOMEM_CLASS					0x00000025
+#define NV03_SIFC_CLASS						0x00000036
+#define NV04_SIFC_CLASS						0x00000076
+#define NV05_SIFC_CLASS						0x00000066
+#define NV30_SIFC_CLASS						0x00000366
+#define NV40_SIFC_CLASS						0x00003066
+#define NV03_SIFM_CLASS						0x00000037
+#define NV04_SIFM_CLASS						0x00000077
+#define NV05_SIFM_CLASS						0x00000063
+#define NV10_SIFM_CLASS						0x00000089
+#define NV30_SIFM_CLASS						0x00000389
+#define NV40_SIFM_CLASS						0x00003089
+#define NV50_SIFM_CLASS						0x00005089
+#define NV03_SYFM_CLASS						0x00000038
+#define NV03_GDI_CLASS						0x0000004b
+#define NV04_GDI_CLASS						0x0000004a
+#define NV04_SURFACE_SWZ_CLASS					0x00000052
+#define NV20_SURFACE_SWZ_CLASS					0x0000009e
+#define NV30_SURFACE_SWZ_CLASS					0x0000039e
+#define NV40_SURFACE_SWZ_CLASS					0x0000309e
+#define NV03_SURFACE_DST_CLASS					0x00000058
+#define NV03_SURFACE_SRC_CLASS					0x00000059
+#define NV04_SURFACE_2D_CLASS					0x00000042
+#define NV10_SURFACE_2D_CLASS					0x00000062
+#define NV30_SURFACE_2D_CLASS					0x00000362
+#define NV40_SURFACE_2D_CLASS					0x00003062
+#define NV50_SURFACE_2D_CLASS					0x00005062
+#define NV04_INDEX_CLASS					0x00000060
+#define NV05_INDEX_CLASS					0x00000064
+#define NV30_INDEX_CLASS					0x00000364
+#define NV40_INDEX_CLASS					0x00003064
+#define NV10_TEXUPLOAD_CLASS					0x0000007b
+#define NV30_TEXUPLOAD_CLASS					0x0000037b
+#define NV40_TEXUPLOAD_CLASS					0x0000307b
+#define NV04_DVD_SUBPICTURE_CLASS				0x00000038
+#define NV10_DVD_SUBPICTURE_CLASS				0x00000088
+#define NV03_M2MF_CLASS						0x00000039
+#define NV50_M2MF_CLASS						0x00005039
+#define NVC0_M2MF_CLASS						0x00009039
+#define NV03_SURFACE_COLOR_CLASS				0x0000005a
+#define NV03_SURFACE_ZETA_CLASS					0x0000005b
+#define NV03_TEXTURED_TRIANGLE_CLASS				0x00000048
+#define NV04_TEXTURED_TRIANGLE_CLASS				0x00000054
+#define NV10_TEXTURED_TRIANGLE_CLASS				0x00000094
+#define NV04_SURFACE_3D_CLASS					0x00000053
+#define NV10_SURFACE_3D_CLASS					0x00000093
+#define NV04_MULTITEX_TRIANGLE_CLASS				0x00000055
+#define NV10_MULTITEX_TRIANGLE_CLASS				0x00000095
+#define NV10_3D_CLASS						0x00000056
+#define NV15_3D_CLASS						0x00000096
+#define NV11_3D_CLASS						0x00000098
+#define NV17_3D_CLASS						0x00000099
+#define NV20_3D_CLASS						0x00000097
+#define NV25_3D_CLASS						0x00000597
+#define NV30_3D_CLASS						0x00000397
+#define NV35_3D_CLASS						0x00000497
+#define NV34_3D_CLASS						0x00000697
+#define NV40_3D_CLASS						0x00004097
+#define NV44_3D_CLASS						0x00004497
+#define NV50_3D_CLASS						0x00005097
+#define NV84_3D_CLASS						0x00008297
+#define NVA0_3D_CLASS						0x00008397
+#define NVA3_3D_CLASS						0x00008597
+#define NVAF_3D_CLASS						0x00008697
+#define NVC0_3D_CLASS						0x00009097
+#define NVC1_3D_CLASS						0x00009197
+#define NVC8_3D_CLASS						0x00009297
+#define NV50_2D_CLASS						0x0000502d
+#define NVC0_2D_CLASS						0x0000902d
+#define NV50_COMPUTE_CLASS					0x000050c0
+#define NVA3_COMPUTE_CLASS					0x000085c0
+#define NVC0_COMPUTE_CLASS					0x000090c0
+#define NVC8_COMPUTE_CLASS					0x000092c0
+#define NV84_CRYPT_CLASS					0x000074c1
+#define BLOB_NVC0_PCOPY1_CLASS					0x000090b8
+#define BLOB_NVC0_PCOPY0_CLASS					0x000090b5
+#define NV31_MPEG_CLASS						0x00003174
+#define NV84_MPEG_CLASS						0x00008274
+
+#define NV01_SUBCHAN__SIZE					0x00008000
 #define NV01_SUBCHAN						0x00000000
 
 #define NV01_SUBCHAN_OBJECT					0x00000000
@@ -217,55 +238,64 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NV04_GRAPH_NOP						0x00000100
 
-#define NV01_GRAPH_NOTIFY					0x00000104
-#define NV01_GRAPH_NOTIFY_WRITE					0x00000000
-#define NV01_GRAPH_NOTIFY_WRITE_AND_AWAKEN			0x00000001
-
-#define NV50_GRAPH_WAIT_FOR_IDLE				0x00000110
+#define NV04_GRAPH_NOTIFY					0x00000104
+#define NV04_GRAPH_NOTIFY_WRITE					0x00000000
+#define NV04_GRAPH_NOTIFY_WRITE_AND_AWAKEN			0x00000001
 
-#define NVA3_GRAPH_UNK0120					0x00000120
+#define NVC0_GRAPH_NOTIFY_ADDRESS_HIGH				0x00000104
 
-#define NVA3_GRAPH_UNK0124					0x00000124
+#define NVC0_GRAPH_NOTIFY_ADDRESS_LOW				0x00000108
 
-#define NV40_GRAPH_PM_TRIGGER					0x00000140
+#define NVC0_GRAPH_NOTIFY					0x0000010c
+#define NVC0_GRAPH_NOTIFY_WRITE					0x00000000
+#define NVC0_GRAPH_NOTIFY_WRITE_AND_AWAKEN			0x00000001
 
-#define NVC0_SUBCHAN__SIZE					0x00008000
-#define NVC0_SUBCHAN						0x00000000
+#define NV50_GRAPH_SERIALIZE					0x00000110
 
-#define NVC0_SUBCHAN_OBJECT					0x00000000
+#define NVC0_GRAPH_MACRO_UPLOAD_POS				0x00000114
 
+#define NVC0_GRAPH_MACRO_UPLOAD_DATA				0x00000118
 
-#define NVC0_SUBCHAN_QUERY_ADDRESS_HIGH				0x00000010
+#define NVC0_GRAPH_MACRO_ID					0x0000011c
 
-#define NVC0_SUBCHAN_QUERY_ADDRESS_LOW				0x00000014
+#define NVC0_GRAPH_MACRO_POS					0x00000120
 
-#define NVC0_SUBCHAN_QUERY_SEQUENCE				0x00000018
+#define NVA3_GRAPH_UNK0120					0x00000120
 
-#define NVC0_SUBCHAN_QUERY_GET					0x0000001c
+#define NVA3_GRAPH_UNK0124					0x00000124
 
-#define NVC0_SUBCHAN_REF_CNT					0x00000050
+#define NVC0_GRAPH_UNK0124					0x00000124
 
-#define NVC0_GRAPH						0x00000000
+#define NVC0_GRAPH_COND_ADDRESS_HIGH				0x00000130
 
-#define NVC0_GRAPH_NOP						0x00000100
+#define NVC0_GRAPH_COND_ADDRESS_LOW				0x00000134
 
-#define NVC0_GRAPH_NOTIFY_ADDRESS_HIGH				0x00000104
+#define NVC0_GRAPH_COND_MODE					0x00000138
+#define NVC0_GRAPH_COND_MODE_NEVER				0x00000000
+#define NVC0_GRAPH_COND_MODE_ALWAYS				0x00000001
+#define NVC0_GRAPH_COND_MODE_RES_NON_ZERO			0x00000002
+#define NVC0_GRAPH_COND_MODE_EQUAL				0x00000003
+#define NVC0_GRAPH_COND_MODE_NOT_EQUAL				0x00000004
 
-#define NVC0_GRAPH_NOTIFY_ADDRESS_LOW				0x00000108
+#define NVC0_GRAPH_UNK013C					0x0000013c
 
-#define NVC0_GRAPH_NOTIFY					0x0000010c
-#define NVC0_GRAPH_NOTIFY_WRITE					0x00000000
-#define NVC0_GRAPH_NOTIFY_WRITE_AND_AWAKEN			0x00000001
+#define NV40_GRAPH_PM_TRIGGER					0x00000140
 
-#define NVC0_GRAPH_SERIALIZE					0x00000110
+#define NVC0_GRAPH_UNK0150					0x00000150
 
-#define NVC0_GRAPH_MACRO_UPLOAD_POS				0x00000114
+#define NVC0_GRAPH_UNK0154					0x00000154
 
-#define NVC0_GRAPH_MACRO_UPLOAD_DATA				0x00000118
+#define NVC0_GRAPH_SCRATCH(i0)				       (0x00003400 + 0x4*(i0))
+#define NVC0_GRAPH_SCRATCH__ESIZE				0x00000004
+#define NVC0_GRAPH_SCRATCH__LEN					0x00000080
 
-#define NVC0_GRAPH_MACRO_ID					0x0000011c
+#define NVC0_GRAPH_MACRO(i0)				       (0x00003800 + 0x8*(i0))
+#define NVC0_GRAPH_MACRO__ESIZE					0x00000008
+#define NVC0_GRAPH_MACRO__LEN					0x00000080
 
-#define NVC0_GRAPH_MACRO_POS					0x00000120
+#define NVC0_GRAPH_MACRO_PARAM(i0)			       (0x00003804 + 0x8*(i0))
+#define NVC0_GRAPH_MACRO_PARAM__ESIZE				0x00000008
+#define NVC0_GRAPH_MACRO_PARAM__LEN				0x00000080
 
 
-#endif /* NV_OBJECT_XML */
+#endif /* RNNDB_NV_OBJECT_XML */