projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'mesa-public/master' into vulkan
[mesa.git] / src / gallium / drivers / nouveau / nv_m2mf.xml.h
diff --git a/src/gallium/drivers/nouveau/nv_m2mf.xml.h b/src/gallium/drivers/nouveau/nv_m2mf.xml.h
index ffdaf95de62cd173050557d8da36350fbf6c0dc0..dbc96a945ef75f21360067b6bc28aab28fd16b86 100644 (file)
--- a/src/gallium/drivers/nouveau/nv_m2mf.xml.h
+++ b/src/gallium/drivers/nouveau/nv_m2mf.xml.h
@@ -1,5 +1,5 @@
-#ifndef NV_M2MF_XML
-#define NV_M2MF_XML
+#ifndef RNNDB_NV_M2MF_XML
+#define RNNDB_NV_M2MF_XML
 
 /* Autogenerated file, DO NOT EDIT manually!
 
@@ -8,13 +8,14 @@ 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_m2mf.xml    (   2710 bytes, from 2010-08-05 19:38:53)
-- copyright.xml  (   6503 bytes, from 2010-04-10 23:15:50)
-- nv_object.xml  (  10424 bytes, from 2010-08-05 19:38:53)
-- nvchipsets.xml (   2824 bytes, from 2010-08-05 19:38:53)
-- nv_defs.xml    (   4437 bytes, from 2010-08-05 19:38:53)
-
-Copyright (C) 2006-2010 by the following authors:
+- rnndb/nv_m2mf.xml      (   2696 bytes, from 2011-07-09 13:43:58)
+- ./rnndb/copyright.xml  (   6452 bytes, from 2011-07-09 13:43:58)
+- ./rnndb/nv_object.xml  (  12672 bytes, from 2011-07-17 12:14:32)
+- ./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-2011 by the following authors:
 - Artur Huillet <arthur.huillet@free.fr> (ahuillet)
 - Ben Skeggs (darktama, darktama_)
 - B. R. <koala_br@users.sourceforge.net> (koala_br)
@@ -25,7 +26,7 @@ Copyright (C) 2006-2010 by the following authors:
 - Dmitry Eremin-Solenikov <lumag@users.sf.net> (lumag)
 - EdB <edb_@users.sf.net> (edb_)
 - Erik Waling <erikwailing@users.sf.net> (erikwaling)
-- Francisco Jerez <currojerez@riseup.net> (curro, curro_, currojerez)
+- Francisco Jerez <currojerez@riseup.net> (curro)
 - imirkin <imirkin@users.sf.net> (imirkin)
 - jb17bsome <jb17bsome@bellsouth.net> (jb17bsome)
 - Jeremy Kolb <kjeremy@users.sf.net> (kjeremy)
@@ -36,7 +37,7 @@ Copyright (C) 2006-2010 by the following authors:
 - Mark Carey <mark.carey@gmail.com> (careym)
 - Matthieu Castet <matthieu.castet@parrot.com> (mat-c)
 - nvidiaman <nvidiaman@users.sf.net> (nvidiaman)
-- Patrice Mandin <mandin.patrice@orange.fr> (pmandin, pmdata)
+- Patrice Mandin <patmandin@gmail.com> (pmandin, pmdata)
 - Pekka Paalanen <pq@iki.fi> (pq, ppaalanen)
 - Peter Popov <ironpeter@users.sf.net> (ironpeter)
 - Richard Hughes <hughsient@users.sf.net> (hughsient)
@@ -74,11 +75,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 
-#define NV04_M2MF_DMA_NOTIFY                                   0x00000180
+#define NV03_M2MF_DMA_NOTIFY                                   0x00000180
 
-#define NV04_M2MF_DMA_BUFFER_IN                                        0x00000184
+#define NV03_M2MF_DMA_BUFFER_IN                                        0x00000184
 
-#define NV04_M2MF_DMA_BUFFER_OUT                               0x00000188
+#define NV03_M2MF_DMA_BUFFER_OUT                               0x00000188
 
 
 #define NV50_M2MF_LINEAR_IN                                    0x00000200
@@ -121,35 +122,35 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NV50_M2MF_OFFSET_OUT_HIGH                              0x0000023c
 
-#define NV04_M2MF_OFFSET_IN                                    0x0000030c
+#define NV03_M2MF_OFFSET_IN                                    0x0000030c
 
-#define NV04_M2MF_OFFSET_OUT                                   0x00000310
+#define NV03_M2MF_OFFSET_OUT                                   0x00000310
 
-#define NV04_M2MF_PITCH_IN                                     0x00000314
+#define NV03_M2MF_PITCH_IN                                     0x00000314
 
-#define NV04_M2MF_PITCH_OUT                                    0x00000318
+#define NV03_M2MF_PITCH_OUT                                    0x00000318
 
-#define NV04_M2MF_LINE_LENGTH_IN                               0x0000031c
+#define NV03_M2MF_LINE_LENGTH_IN                               0x0000031c
 
-#define NV04_M2MF_LINE_COUNT                                   0x00000320
+#define NV03_M2MF_LINE_COUNT                                   0x00000320
 
-#define NV04_M2MF_FORMAT                                       0x00000324
-#define NV04_M2MF_FORMAT_INPUT_INC__MASK                       0x000000ff
-#define NV04_M2MF_FORMAT_INPUT_INC__SHIFT                      0
-#define NV04_M2MF_FORMAT_INPUT_INC_1                           0x00000001
-#define NV04_M2MF_FORMAT_INPUT_INC_2                           0x00000002
-#define NV04_M2MF_FORMAT_INPUT_INC_4                           0x00000004
+#define NV03_M2MF_FORMAT                                       0x00000324
+#define NV03_M2MF_FORMAT_INPUT_INC__MASK                       0x000000ff
+#define NV03_M2MF_FORMAT_INPUT_INC__SHIFT                      0
+#define NV03_M2MF_FORMAT_INPUT_INC_1                           0x00000001
+#define NV03_M2MF_FORMAT_INPUT_INC_2                           0x00000002
+#define NV03_M2MF_FORMAT_INPUT_INC_4                           0x00000004
 #define NV50_M2MF_FORMAT_INPUT_INC_8                           0x00000008
 #define NV50_M2MF_FORMAT_INPUT_INC_16                          0x00000010
-#define NV04_M2MF_FORMAT_OUTPUT_INC__MASK                      0x0000ff00
-#define NV04_M2MF_FORMAT_OUTPUT_INC__SHIFT                     8
-#define NV04_M2MF_FORMAT_OUTPUT_INC_1                          0x00000100
-#define NV04_M2MF_FORMAT_OUTPUT_INC_2                          0x00000200
-#define NV04_M2MF_FORMAT_OUTPUT_INC_4                          0x00000400
+#define NV03_M2MF_FORMAT_OUTPUT_INC__MASK                      0x0000ff00
+#define NV03_M2MF_FORMAT_OUTPUT_INC__SHIFT                     8
+#define NV03_M2MF_FORMAT_OUTPUT_INC_1                          0x00000100
+#define NV03_M2MF_FORMAT_OUTPUT_INC_2                          0x00000200
+#define NV03_M2MF_FORMAT_OUTPUT_INC_4                          0x00000400
 #define NV50_M2MF_FORMAT_OUTPUT_INC_8                          0x00000800
 #define NV50_M2MF_FORMAT_OUTPUT_INC_16                         0x00001000
 
-#define NV04_M2MF_BUF_NOTIFY                                   0x00000328
+#define NV03_M2MF_BUF_NOTIFY                                   0x00000328
 
 
-#endif /* NV_M2MF_XML */
+#endif /* RNNDB_NV_M2MF_XML */