From e72b76b94bdfff49bbd4aefb5b489599a39ca2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 21 Oct 2020 18:18:46 -0400
Subject: [PATCH] amd: update gfx10-rsrc.json for gfx10.3

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7264>
---
 src/amd/registers/gfx10-rsrc.json | 80 +++++++++++++++++++++++++++++--
 1 file changed, 76 insertions(+), 4 deletions(-)

diff --git a/src/amd/registers/gfx10-rsrc.json b/src/amd/registers/gfx10-rsrc.json
index 77b90d87fa7..0427836222b 100644
--- a/src/amd/registers/gfx10-rsrc.json
+++ b/src/amd/registers/gfx10-rsrc.json
@@ -211,11 +211,17 @@
    "name": "SQ_BUF_RSRC_WORD2"
   },
   {
-   "chips": ["gfx10", "gfx103"],
+   "chips": ["gfx10"],
    "map": {"at": 36620, "to": "mm"},
    "name": "SQ_BUF_RSRC_WORD3",
    "type_ref": "SQ_BUF_RSRC_WORD3"
   },
+  {
+   "chips": ["gfx103"],
+   "map": {"at": 36620, "to": "mm"},
+   "name": "SQ_BUF_RSRC_WORD3",
+   "type_ref": "SQ_BUF_RSRC_WORD3_gfx103"
+  },
   {
    "chips": ["gfx10", "gfx103"],
    "map": {"at": 36348, "to": "mm"},
@@ -246,23 +252,41 @@
    "type_ref": "SQ_IMG_RSRC_WORD3"
   },
   {
-   "chips": ["gfx10", "gfx103"],
+   "chips": ["gfx10"],
    "map": {"at": 40976, "to": "mm"},
    "name": "SQ_IMG_RSRC_WORD4",
    "type_ref": "SQ_IMG_RSRC_WORD4"
   },
   {
-   "chips": ["gfx10", "gfx103"],
+   "chips": ["gfx103"],
+   "map": {"at": 40976, "to": "mm"},
+   "name": "SQ_IMG_RSRC_WORD4",
+   "type_ref": "SQ_IMG_RSRC_WORD4_gfx103"
+  },
+  {
+   "chips": ["gfx10"],
    "map": {"at": 40980, "to": "mm"},
    "name": "SQ_IMG_RSRC_WORD5",
    "type_ref": "SQ_IMG_RSRC_WORD5"
   },
   {
-   "chips": ["gfx10", "gfx103"],
+   "chips": ["gfx103"],
+   "map": {"at": 40980, "to": "mm"},
+   "name": "SQ_IMG_RSRC_WORD5",
+   "type_ref": "SQ_IMG_RSRC_WORD5_gfx103"
+  },
+  {
+   "chips": ["gfx10"],
    "map": {"at": 40984, "to": "mm"},
    "name": "SQ_IMG_RSRC_WORD6",
    "type_ref": "SQ_IMG_RSRC_WORD6"
   },
+  {
+   "chips": ["gfx103"],
+   "map": {"at": 40984, "to": "mm"},
+   "name": "SQ_IMG_RSRC_WORD6",
+   "type_ref": "SQ_IMG_RSRC_WORD6_gfx103"
+  },
   {
    "chips": ["gfx10", "gfx103"],
    "map": {"at": 40988, "to": "mm"},
@@ -316,6 +340,21 @@
     {"bits": [30, 31], "comment": "must be 0", "name": "TYPE"}
    ]
   },
+  "SQ_BUF_RSRC_WORD3_gfx103": {
+   "fields": [
+    {"bits": [0, 2], "name": "DST_SEL_X"},
+    {"bits": [3, 5], "name": "DST_SEL_Y"},
+    {"bits": [6, 8], "name": "DST_SEL_Z"},
+    {"bits": [9, 11], "name": "DST_SEL_W"},
+    {"bits": [12, 18], "enum_ref": "IMG_FORMAT", "name": "FORMAT"},
+    {"bits": [21, 22], "name": "INDEX_STRIDE"},
+    {"bits": [23, 23], "name": "ADD_TID_ENABLE"},
+    {"bits": [24, 24], "comment": "must be 1", "name": "RESOURCE_LEVEL"},
+    {"bits": [26, 27], "name": "LLC_NOALLOC"},
+    {"bits": [28, 29], "enum_ref": "SQ_BUF_RSRC_WORD3__OOB_SELECT", "name": "OOB_SELECT"},
+    {"bits": [30, 31], "comment": "must be 0", "name": "TYPE"}
+   ]
+  },
   "SQ_EXP_0": {
    "fields": [
     {"bits": [0, 3], "name": "EN"},
@@ -359,7 +398,25 @@
     {"bits": [16, 28], "name": "BASE_ARRAY"}
    ]
   },
+  "SQ_IMG_RSRC_WORD4_gfx103": {
+   "fields": [
+    {"bits": [0, 12], "name": "DEPTH"},
+    {"bits": [0, 13], "comment": "only for 1D, 2D, and 2D_MSAA if pitch > width", "name": "PITCH"},
+    {"bits": [16, 28], "name": "BASE_ARRAY"}
+   ]
+  },
   "SQ_IMG_RSRC_WORD5": {
+   "fields": [
+    {"bits": [0, 3], "name": "ARRAY_PITCH"},
+    {"bits": [4, 7], "name": "MAX_MIP"},
+    {"bits": [8, 19], "name": "MIN_LOD_WARN"},
+    {"bits": [20, 22], "name": "PERF_MOD"},
+    {"bits": [23, 23], "name": "CORNER_SAMPLES"},
+    {"bits": [25, 25], "name": "LOD_HDW_CNT_EN"},
+    {"bits": [26, 26], "name": "PRT_DEFAULT"}
+   ]
+  },
+  "SQ_IMG_RSRC_WORD5_gfx103": {
    "fields": [
     {"bits": [0, 3], "name": "ARRAY_PITCH"},
     {"bits": [4, 7], "name": "MAX_MIP"},
@@ -385,6 +442,21 @@
     {"bits": [24, 31], "name": "META_DATA_ADDRESS_LO"}
    ]
   },
+  "SQ_IMG_RSRC_WORD6_gfx103": {
+   "fields": [
+    {"bits": [0, 7], "name": "COUNTER_BANK_ID"},
+    {"bits": [8, 9], "name": "LLC_NOALLOC"},
+    {"bits": [10, 10], "name": "ITERATE_256"},
+    {"bits": [15, 16], "name": "MAX_UNCOMPRESSED_BLOCK_SIZE"},
+    {"bits": [17, 18], "name": "MAX_COMPRESSED_BLOCK_SIZE"},
+    {"bits": [19, 19], "name": "META_PIPE_ALIGNED"},
+    {"bits": [20, 20], "name": "WRITE_COMPRESS_ENABLE"},
+    {"bits": [21, 21], "name": "COMPRESSION_EN"},
+    {"bits": [22, 22], "name": "ALPHA_IS_ON_MSB"},
+    {"bits": [23, 23], "name": "COLOR_TRANSFORM"},
+    {"bits": [24, 31], "name": "META_DATA_ADDRESS_LO"}
+   ]
+  },
   "SQ_IMG_SAMP_WORD0": {
    "fields": [
     {"bits": [0, 2], "name": "CLAMP_X"},