nv50_2d: regenerate envytools-based rnndb headers

The headers hadn't been regenerated from envytools in a long time,
and there were a few minor divergences.

Based on envytools commit c20929ed0f3be18b8419f7332ee22d905feb6589

Among other things, rnndb has changed naming to G80/etc, for now
I've not tackled switching that over and replaced the nvidia
codenames back to the chip ids that mesa uses with the following:

  $ sed -i 's/G80_2D/NV50_2D/g' rnndb/graph/g80_2d.xml.h
  $ sed -i 's/GF100_2D/NVC0_2D/g' rnndb/graph/g80_2d.xml.h

No other modifications of the headergen'd headers was done, which
was helped by the differing #define's being unutilised presently.

Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5920>

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h
index 31e7cf822334a942d868f18114e15b038d0f5af0..475f8da63a8bf218e4a67f2997e3e7864bd2744d 100644 (file)
--- a/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h
+++ b/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h
@@ -4,18 +4,18 @@
 /* Autogenerated file, DO NOT EDIT manually!
 
 This file was generated by the rules-ng-ng headergen tool in this git repository:
-http://github.com/envytools/envytools/
+https://github.com/envytools/envytools/
 git clone https://github.com/envytools/envytools.git
 
 The rules-ng-ng source files this header was generated from are:
-- rnndb/graph/g80_2d.xml   (  11440 bytes, from 2014-09-25 06:32:11)
-- rnndb/copyright.xml      (   6452 bytes, from 2013-05-14 03:57:49)
-- rnndb/fifo/nv_object.xml (  15326 bytes, from 2014-09-25 06:32:11)
-- rnndb/nvchipsets.xml     (   2759 bytes, from 2014-10-05 01:51:02)
-- rnndb/g80_defs.xml       (  18175 bytes, from 2014-09-25 06:32:11)
-- rnndb/nv_defs.xml        (   4399 bytes, from 2013-09-07 03:32:45)
-
-Copyright (C) 2006-2014 by the following authors:
+- rnndb/graph/g80_2d.xml         (  11609 bytes, from 2020-07-15 13:41:28)
+- rnndb/copyright.xml            (   6431 bytes, from 2020-07-11 09:17:41)
+- rnndb/fifo/nv_object.xml       (  16105 bytes, from 2020-07-11 09:17:37)
+- rnndb-generated/nvchipsets.xml (   3335 bytes, from 2020-06-09 15:36:30)
+- rnndb/g80_defs.xml             (  21768 bytes, from 2018-06-10 18:06:54)
+- rnndb/nv_defs.xml              (   5388 bytes, from 2018-06-10 18:06:54)
+
+Copyright (C) 2006-2020 by the following authors:
 - Artur Huillet <arthur.huillet@free.fr> (ahuillet)
 - Ben Skeggs (darktama, darktama_)
 - B. R. <koala_br@users.sourceforge.net> (koala_br)
@@ -27,13 +27,13 @@ Copyright (C) 2006-2014 by the following authors:
 - EdB <edb_@users.sf.net> (edb_)
 - Erik Waling <erikwailing@users.sf.net> (erikwaling)
 - Francisco Jerez <currojerez@riseup.net> (curro)
-- imirkin <imirkin@users.sf.net> (imirkin)
+- Ilia Mirkin <imirkin@alum.mit.edu> (imirkin)
 - jb17bsome <jb17bsome@bellsouth.net> (jb17bsome)
 - Jeremy Kolb <kjeremy@users.sf.net> (kjeremy)
 - Laurent Carlier <lordheavym@gmail.com> (lordheavy)
 - Luca Barbieri <luca@luca-barbieri.com> (lb, lb1)
 - Maarten Maathuis <madman2003@gmail.com> (stillunknown)
-- Marcin Kościelnicki <koriakin@0x04.net> (mwk, koriakin)
+- Marcelina Kościelnicka <mwk@0x04.net> (mwk)
 - Mark Carey <mark.carey@gmail.com> (careym)
 - Matthieu Castet <matthieu.castet@parrot.com> (mat-c)
 - nvidiaman <nvidiaman@users.sf.net> (nvidiaman)
@@ -88,7 +88,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NV50_2D_DST_LINEAR                                     0x00000204
 
-#define NV50_2D_DST_TILE_MODE                                  0x00000208
+#define NV50_2D_DST_BLOCK_DIMENSIONS                           0x00000208
+#define NV50_2D_DST_BLOCK_DIMENSIONS_DEPTH__MASK                       0x00000f00
+#define NV50_2D_DST_BLOCK_DIMENSIONS_DEPTH__SHIFT              8
+#define NV50_2D_DST_BLOCK_DIMENSIONS_HEIGHT__MASK              0x000000f0
+#define NV50_2D_DST_BLOCK_DIMENSIONS_HEIGHT__SHIFT             4
+#define NV50_2D_DST_BLOCK_DIMENSIONS_WIDTH__MASK                       0x0000000f
+#define NV50_2D_DST_BLOCK_DIMENSIONS_WIDTH__SHIFT              0
 
 #define NV50_2D_DST_DEPTH                                      0x0000020c
 
@@ -114,7 +120,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NV50_2D_SRC_LINEAR                                     0x00000234
 
-#define NV50_2D_SRC_TILE_MODE                                  0x00000238
+#define NV50_2D_SRC_BLOCK_DIMENSIONS                           0x00000238
+#define NV50_2D_SRC_BLOCK_DIMENSIONS_DEPTH__MASK                       0x00000f00
+#define NV50_2D_SRC_BLOCK_DIMENSIONS_DEPTH__SHIFT              8
+#define NV50_2D_SRC_BLOCK_DIMENSIONS_HEIGHT__MASK              0x000000f0
+#define NV50_2D_SRC_BLOCK_DIMENSIONS_HEIGHT__SHIFT             4
+#define NV50_2D_SRC_BLOCK_DIMENSIONS_WIDTH__MASK                       0x0000000f
+#define NV50_2D_SRC_BLOCK_DIMENSIONS_WIDTH__SHIFT              0
 
 #define NV50_2D_SRC_DEPTH                                      0x0000023c
 
@@ -218,7 +230,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NV50_2D_PATTERN_SELECT_BITMAP_1X64                     0x00000002
 #define NV50_2D_PATTERN_SELECT_COLOR                           0x00000003
 
-#define NVC0_2D_SET_DST_COLOR_RENDER_TO_ZETA_SURFACE  0x000002b8
+#define NVC0_2D_SET_DST_COLOR_RENDER_TO_ZETA_SURFACE           0x000002b8
+
+#define NVC0_2D_UNK02BC(i0)                                   (0x000002bc + 0x4*(i0))
+#define NVC0_2D_UNK02BC__ESIZE                                 0x00000004
+#define NVC0_2D_UNK02BC__LEN                                   0x00000008
 
 #define NVC0_2D_UNK2DC                                         0x000002dc