ac/registers: adjust some definitions for thread trace on GFX8
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Mon, 2 Mar 2020 14:47:52 +0000 (15:47 +0100)
committerMarge Bot <eric+marge@anholt.net>
Fri, 6 Mar 2020 08:00:39 +0000 (08:00 +0000)
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4022>

src/amd/registers/amdgfxregs.json

index 1cee6ed57b24267b74df920d8c217648b6d9075e..ecfc8bc7a67e063a185443bc46b0d01f7019105a 100644 (file)
    "type_ref": "SQ_THREAD_TRACE_HIWATER"
   },
   {
-   "chips": ["gfx7", "fiji", "gfx9", "stoney", "gfx8"],
+   "chips": ["gfx7", "fiji", "stoney", "gfx8"],
+   "map": {"at": 36416, "to": "mm"},
+   "name": "SQ_THREAD_TRACE_CNTR",
+   "type_ref": "SQ_THREAD_TRACE_CNTR"
+  },
+  {
+   "chips": ["gfx9"],
    "map": {"at": 199920, "to": "mm"},
    "name": "SQ_THREAD_TRACE_CNTR",
    "type_ref": "SQ_THREAD_TRACE_CNTR"
     {"bits": [8, 11], "name": "SIMD_EN"},
     {"bits": [12, 13], "name": "VM_ID_MASK"},
     {"bits": [14, 14], "name": "SPI_STALL_EN"},
-    {"bits": [15, 15], "name": "SQ_STALL_EN"}
+    {"bits": [15, 15], "name": "SQ_STALL_EN"},
+    {"bits": [16, 31], "comment": "not on GFX9", "name": "RANDOM_SEED"}
    ]
   },
   "SQ_THREAD_TRACE_TOKEN_MASK": {
    "fields": [
     {"bits": [0, 9], "name": "FINISH_PENDING"},
     {"bits": [16, 25], "name": "FINISH_DONE"},
-    {"bits": [28, 28], "name": "UTC_ERROR"},
+    {"bits": [28, 28], "comment": "only on GFX9", "name": "UTC_ERROR"},
     {"bits": [29, 29], "name": "NEW_BUF"},
     {"bits": [30, 30], "name": "BUSY"},
     {"bits": [31, 31], "name": "FULL"}