From debc543904235ed7dfc14217bf43f33f9f768e5a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Fri, 31 Mar 2023 23:06:47 -0400
Subject: [PATCH] amd/registers: use gfx9 packet definitions for gfx940

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22158>
---
 src/amd/registers/pkt3.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/amd/registers/pkt3.json b/src/amd/registers/pkt3.json
index bdee735..2dc3215 100644
--- a/src/amd/registers/pkt3.json
+++ b/src/amd/registers/pkt3.json
@@ -214,7 +214,7 @@
    "type_ref": "COMMAND"
   },
   {
-   "chips": ["gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1045, "to": "pkt3"},
    "name": "COMMAND",
    "type_ref": "COMMAND_gfx9"
@@ -226,13 +226,13 @@
    "type_ref": "CONTROL"
   },
   {
-   "chips": ["gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 880, "to": "pkt3"},
    "name": "CONTROL",
    "type_ref": "CONTROL_cik"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1040, "to": "pkt3"},
    "name": "CP_DMA_WORD0",
    "type_ref": "CP_DMA_WORD0"
@@ -250,19 +250,19 @@
    "type_ref": "CP_DMA_WORD1_cik"
   },
   {
-   "chips": ["gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1041, "to": "pkt3"},
    "name": "CP_DMA_WORD1",
    "type_ref": "CP_DMA_WORD1_gfx9"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1042, "to": "pkt3"},
    "name": "CP_DMA_WORD2",
    "type_ref": "CP_DMA_WORD2"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1043, "to": "pkt3"},
    "name": "CP_DMA_WORD3",
    "type_ref": "CP_DMA_WORD3"
@@ -280,28 +280,28 @@
    "type_ref": "DMA_DATA_WORD0_cik"
   },
   {
-   "chips": ["gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1280, "to": "pkt3"},
    "name": "DMA_DATA_WORD0",
    "type_ref": "DMA_DATA_WORD0_gfx9"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 882, "to": "pkt3"},
    "name": "DST_ADDR_HI"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1284, "to": "pkt3"},
    "name": "DST_ADDR_HI"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 881, "to": "pkt3"},
    "name": "DST_ADDR_LO"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1283, "to": "pkt3"},
    "name": "DST_ADDR_LO"
   },
@@ -312,17 +312,17 @@
    "type_ref": "GCR_CNTL"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1009, "to": "pkt3"},
    "name": "IB_BASE_HI"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1008, "to": "pkt3"},
    "name": "IB_BASE_LO"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1010, "to": "pkt3"},
    "name": "IB_CONTROL",
    "type_ref": "IB_CONTROL"
@@ -340,12 +340,12 @@
    "type_ref": "RELEASE_MEM_OP_gfx11"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1282, "to": "pkt3"},
    "name": "SRC_ADDR_HI"
   },
   {
-   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx10", "gfx103", "gfx11"],
+   "chips": ["gfx6", "gfx7", "gfx8", "gfx81", "gfx9", "gfx940", "gfx10", "gfx103", "gfx11"],
    "map": {"at": 1281, "to": "pkt3"},
    "name": "SRC_ADDR_LO"
   },
-- 
2.7.4