drm/amdgpu: update mmhub 4.1.0 client id mappings

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

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

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c
index f2ab5001b4924961942d82e5eba5c9cc9413bef9..951998454b257294388bc41e01b2c19d87060688 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c
@@ -37,39 +37,31 @@
 static const char *mmhub_client_ids_v4_1_0[][2] = {
        [0][0] = "VMC",
        [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",
+       [16][0] = "LSDMA",
+       [17][0] = "JPEG",
+       [19][0] = "VCNU",
+       [22][0] = "VSCH",
+       [23][0] = "HDP",
+       [32+23][0] = "VCNRD",
        [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",
+       [12][1] = "DBGUNBIO",
        [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",
+       [16][1] = "LSDMA",
+       [17][1] = "JPEG",
+       [18][1] = "VCNWR",
+       [19][1] = "VCNU",
+       [22][1] = "VSCH",
+       [23][1] = "HDP",
 };
 
 static uint32_t mmhub_v4_1_0_get_invalidate_req(unsigned int vmid,