This commit is to update the repo for display during a meeting.

- Added an Ampere version of the device info data.
- Added Ampere versions of auxillary functions.
- Modified display functions to accommodate Ampere data.
- Made other various small modifications.

1 files changed, 16 insertions, 21 deletions

diff --git a/nvdebug.h b/nvdebug.h
index f6e057e..3ccdcfe 100644
--- a/nvdebug.h
+++ b/nvdebug.h
@@ -554,34 +554,30 @@ static const char* const ENGINE_TYPES_NAMES[ENGINE_TYPES_LEN] = {
   See dev_top.ref.txt of NVIDIA's open-gpu-doc for more info.
 */
 
-#ifdef NV_BUILD_FOR_AMPERE
-#define NV_PTOP_DEVICE_INFO(i) (0x00022800+(i)*4)
+#define NV_PTOP_DEVICE_INFO_AMPERE(i) (0x00022800+(i)*4)
+#define NV_PTOP_DEVICE_INFO_PREVIOUS(i) (0x00022700+(i)*4)
 #define NV_PTOP_DEVICE_INFO__SIZE_1 64
 typedef union {
         struct {
-                uint32_t fault_id:7;
-                uint32_t padding0:9;
-                uint32_t inst_id:4;
-                uint32_t padding1:4;
-                enum ENGINE_TYPES engine_type:7;
-                bool has_next_entry:1;
+                uint32_t fault_id_ampere:7;
+                uint32_t padding0_ampere:9;
+                uint32_t inst_id_ampere:4;
+                uint32_t padding1_ampere:4;
+                enum ENGINE_TYPES engine_type_ampere:7;
+                bool has_next_entry_ampere:1;
         } __attribute__((packed));
         struct {
-                uint32_t reset_enum:5;
-                uint32_t padding2:7;
-                uint32_t pri_base:12;
+                uint32_t reset_enum_ampere:5;
+                uint32_t padding2_ampere:7;
+                uint32_t pri_base_ampere:12;
+                uint32_t padding3_ampere:8;
         } __attribute__((packed));
         struct {
-                uint32_t engine_enum:2;
-                uint32_t padding3:4;
-                uint32_t runlist_enum:14;
+                uint32_t engine_enum_ampere:2;
+                uint32_t padding4_ampere:4;
+                uint32_t runlist_enum_ampere:14;
+                uint32_t padding5_ampere:12;
         } __attribute__((packed));
-        uint32_t raw;
-} ptop_device_info_t;
-#else
-#define NV_PTOP_DEVICE_INFO(i) (0x00022700+(i)*4)
-#define NV_PTOP_DEVICE_INFO__SIZE_1 64
-typedef union {
         // DATA type fields
         struct {
                 enum DEVICE_INFO_TYPE info_type:2;
@@ -619,7 +615,6 @@ typedef union {
         } __attribute__((packed));
         uint32_t raw;
 } ptop_device_info_t;
-#endif
 
 #define NV_PTOP_SCAL_NUM_GPCS 0x00022430
 #define NV_PTOP_SCAL_NUM_TPC_PER_GPC 0x00022434