drm/amdgpu: update mmhub 3.0.1 client id mappings

Update the client id mapping so the correct clients
get printed when there is a mmhub page fault.

Reviewed-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 2a2681eda73b99a2c1ee8cdb006099ea5d0c2505)
Cc: stable@vger.kernel.org

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c
index 134c4ec1088785c0c9886f94e0fa2f915bcc903d..910337dc28d10536f67cccabf14f56d815cd5e88 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c
@@ -36,40 +36,47 @@
 
 static const char *mmhub_client_ids_v3_0_1[][2] = {
        [0][0] = "VMC",
+       [1][0] = "ISPXT",
+       [2][0] = "ISPIXT",
        [4][0] = "DCEDMC",
        [5][0] = "DCEVGA",
        [6][0] = "MP0",
        [7][0] = "MP1",
-       [8][0] = "MPIO",
-       [16][0] = "HDP",
-       [17][0] = "LSDMA",
-       [18][0] = "JPEG",
-       [19][0] = "VCNU0",
-       [21][0] = "VSCH",
-       [22][0] = "VCNU1",
-       [23][0] = "VCN1",
-       [32+20][0] = "VCN0",
-       [2][1] = "DBGUNBIO",
+       [8][0] = "MPM",
+       [12][0] = "ISPTNR",
+       [14][0] = "ISPCRD0",
+       [15][0] = "ISPCRD1",
+       [16][0] = "ISPCRD2",
+       [22][0] = "HDP",
+       [23][0] = "LSDMA",
+       [24][0] = "JPEG",
+       [27][0] = "VSCH",
+       [28][0] = "VCNU",
+       [29][0] = "VCN",
+       [1][1] = "ISPXT",
+       [2][1] = "ISPIXT",
        [3][1] = "DCEDWB",
        [4][1] = "DCEDMC",
        [5][1] = "DCEVGA",
        [6][1] = "MP0",
        [7][1] = "MP1",
-       [8][1] = "MPIO",
-       [10][1] = "DBGU0",
-       [11][1] = "DBGU1",
-       [12][1] = "DBGU2",
-       [13][1] = "DBGU3",
-       [14][1] = "XDP",
-       [15][1] = "OSSSYS",
-       [16][1] = "HDP",
-       [17][1] = "LSDMA",
-       [18][1] = "JPEG",
-       [19][1] = "VCNU0",
-       [20][1] = "VCN0",
-       [21][1] = "VSCH",
-       [22][1] = "VCNU1",
-       [23][1] = "VCN1",
+       [8][1] = "MPM",
+       [10][1] = "ISPMWR0",
+       [11][1] = "ISPMWR1",
+       [12][1] = "ISPTNR",
+       [13][1] = "ISPSWR",
+       [14][1] = "ISPCWR0",
+       [15][1] = "ISPCWR1",
+       [16][1] = "ISPCWR2",
+       [17][1] = "ISPCWR3",
+       [18][1] = "XDP",
+       [21][1] = "OSSSYS",
+       [22][1] = "HDP",
+       [23][1] = "LSDMA",
+       [24][1] = "JPEG",
+       [27][1] = "VSCH",
+       [28][1] = "VCNU",
+       [29][1] = "VCN",
 };
 
 static uint32_t mmhub_v3_0_1_get_invalidate_req(unsigned int vmid,