From 72283020093525ca5248d7f408e88b0bcba1e52b Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Tue, 30 Dec 2014 22:27:57 -0500 Subject: nvc0: regenerate rnndb headers The headers hadn't been regenerated in a long time and had seen a number of manual modifications. A few changes: - remove nvc0_2d entirely, use the nv50 header which has the nvc0 values too - remove 3ddefs, it's identical to the nv50 file - move macros out into a separate file Also the upstream rnndb changed the overall chip naming convention; this was fixed up manually in the generated files until a better solution is determined. Signed-off-by: Ilia Mirkin --- src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h | 67 +++++++++++++++++------- 1 file changed, 47 insertions(+), 20 deletions(-) (limited to 'src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h') diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h b/src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h index 3bf628d..6c0c51e 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h @@ -4,17 +4,17 @@ /* Autogenerated file, DO NOT EDIT manually! This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng +http://github.com/envytools/envytools/ +git clone https://github.com/envytools/envytools.git The rules-ng-ng source files this header was generated from are: -- nvc0_m2mf.xml ( 2227 bytes, from 2010-10-16 16:10:29) -- copyright.xml ( 6498 bytes, from 2010-10-03 13:18:37) -- nv_object.xml ( 11379 bytes, from 2010-10-16 11:43:24) -- nvchipsets.xml ( 2907 bytes, from 2010-10-15 16:28:21) -- nv_defs.xml ( 4437 bytes, from 2010-07-06 07:43:58) +- rnndb/graph/gf100_m2mf.xml ( 2783 bytes, from 2014-09-25 06:32:11) +- rnndb/copyright.xml ( 6456 bytes, from 2014-12-31 02:13:31) +- 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) -Copyright (C) 2006-2010 by the following authors: +Copyright (C) 2006-2014 by the following authors: - Artur Huillet (ahuillet) - Ben Skeggs (darktama, darktama_) - B. R. (koala_br) @@ -25,8 +25,8 @@ Copyright (C) 2006-2010 by the following authors: - Dmitry Eremin-Solenikov (lumag) - EdB (edb_) - Erik Waling (erikwaling) -- Francisco Jerez (curro, curro_, currojerez) -- imirkin (imirkin) +- Francisco Jerez (curro) +- Ilia Mirkin (imirkin) - jb17bsome (jb17bsome) - Jeremy Kolb (kjeremy) - Laurent Carlier (lordheavy) @@ -92,25 +92,41 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NVC0_M2MF_TILING_DEPTH_OUT 0x0000022c -#define NVC0_M2MF_TILING_POSITION_OUT_Z 0x00000230 +#define NVC0_M2MF_TILING_POSITION_OUT_Z 0x00000230 #define NVC0_M2MF_OFFSET_OUT_HIGH 0x00000238 #define NVC0_M2MF_OFFSET_OUT_LOW 0x0000023c +#define NVC0_M2MF_UNK0240(i0) (0x00000240 + 0x4*(i0)) +#define NVC0_M2MF_UNK0240__ESIZE 0x00000004 +#define NVC0_M2MF_UNK0240__LEN 0x0000000f + +#define NVC0_M2MF_FIRMWARE(i0) (0x0000027c + 0x4*(i0)) +#define NVC0_M2MF_FIRMWARE__ESIZE 0x00000004 +#define NVC0_M2MF_FIRMWARE__LEN 0x00000020 + +#define NVC0_M2MF_UNK02FC 0x000002fc + #define NVC0_M2MF_EXEC 0x00000300 #define NVC0_M2MF_EXEC_PUSH 0x00000001 #define NVC0_M2MF_EXEC_LINEAR_IN 0x00000010 #define NVC0_M2MF_EXEC_LINEAR_OUT 0x00000100 -#define NVC0_M2MF_EXEC_NOTIFY 0x00002000 -#define NVC0_M2MF_EXEC_INC__MASK 0x00f00000 -#define NVC0_M2MF_EXEC_INC__SHIFT 20 +#define NVC0_M2MF_EXEC_QUERY__MASK 0x00003000 +#define NVC0_M2MF_EXEC_QUERY__SHIFT 12 +#define NVC0_M2MF_EXEC_QUERY_NO 0x00000000 +#define NVC0_M2MF_EXEC_QUERY_UNK1 0x00001000 +#define NVC0_M2MF_EXEC_QUERY_YES 0x00002000 +#define NVC0_M2MF_EXEC_BUF_NOTIFY 0x00030000 +#define NVC0_M2MF_EXEC_QUERY_SHORT 0x00100000 #define NVC0_M2MF_DATA 0x00000304 +#define NVC0_M2MF_UNK308 0x00000308 + #define NVC0_M2MF_OFFSET_IN_HIGH 0x0000030c -#define NVC0_M2MF_OFFSET_IN_LOW 0x00000310 +#define NVC0_M2MF_OFFSET_IN_LOW 0x00000310 #define NVC0_M2MF_PITCH_IN 0x00000314 @@ -120,19 +136,30 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NVC0_M2MF_LINE_COUNT 0x00000320 -#define NVC0_M2MF_NOTIFY_ADDRESS_HIGH 0x0000032c +#define NVC0_M2MF_QUERY_ADDRESS_HIGH 0x0000032c + +#define NVC0_M2MF_QUERY_ADDRESS_LOW 0x00000330 + +#define NVC0_M2MF_QUERY_SEQUENCE 0x00000334 + +#define NVC0_M2MF_COND_ADDRESS_HIGH 0x00000338 -#define NVC0_M2MF_NOTIFY_ADDRESS_LOW 0x00000330 +#define NVC0_M2MF_COND_ADDRESS_LOW 0x0000033c -#define NVC0_M2MF_NOTIFY 0x00000334 +#define NVC0_M2MF_COND_MODE 0x00000340 +#define NVC0_M2MF_COND_MODE_NEVER 0x00000000 +#define NVC0_M2MF_COND_MODE_ALWAYS 0x00000001 +#define NVC0_M2MF_COND_MODE_RES_NON_ZERO 0x00000002 +#define NVC0_M2MF_COND_MODE_EQUAL 0x00000003 +#define NVC0_M2MF_COND_MODE_NOT_EQUAL 0x00000004 #define NVC0_M2MF_TILING_POSITION_IN_X 0x00000344 #define NVC0_M2MF_TILING_POSITION_IN_Y 0x00000348 -#define NVC0_M2MF_TILING_POSITION_OUT_X 0x0000034c +#define NVC0_M2MF_TILING_POSITION_OUT_X 0x0000034c -#define NVC0_M2MF_TILING_POSITION_OUT_Y 0x00000350 +#define NVC0_M2MF_TILING_POSITION_OUT_Y 0x00000350 #endif /* NVC0_M2MF_XML */ -- cgit v1.1