Skip to content

Commit e851042

Browse files
alexdeuchergregkh
authored andcommitted
drm/amdgpu: update mmhub 3.0.1 client id mappings
commit 0bae62c upstream. 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 2a2681e) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a5c0604 commit e851042

File tree

1 file changed

+32
-25
lines changed

1 file changed

+32
-25
lines changed

drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,40 +36,47 @@
3636

3737
static const char *mmhub_client_ids_v3_0_1[][2] = {
3838
[0][0] = "VMC",
39+
[1][0] = "ISPXT",
40+
[2][0] = "ISPIXT",
3941
[4][0] = "DCEDMC",
4042
[5][0] = "DCEVGA",
4143
[6][0] = "MP0",
4244
[7][0] = "MP1",
43-
[8][0] = "MPIO",
44-
[16][0] = "HDP",
45-
[17][0] = "LSDMA",
46-
[18][0] = "JPEG",
47-
[19][0] = "VCNU0",
48-
[21][0] = "VSCH",
49-
[22][0] = "VCNU1",
50-
[23][0] = "VCN1",
51-
[32+20][0] = "VCN0",
52-
[2][1] = "DBGUNBIO",
45+
[8][0] = "MPM",
46+
[12][0] = "ISPTNR",
47+
[14][0] = "ISPCRD0",
48+
[15][0] = "ISPCRD1",
49+
[16][0] = "ISPCRD2",
50+
[22][0] = "HDP",
51+
[23][0] = "LSDMA",
52+
[24][0] = "JPEG",
53+
[27][0] = "VSCH",
54+
[28][0] = "VCNU",
55+
[29][0] = "VCN",
56+
[1][1] = "ISPXT",
57+
[2][1] = "ISPIXT",
5358
[3][1] = "DCEDWB",
5459
[4][1] = "DCEDMC",
5560
[5][1] = "DCEVGA",
5661
[6][1] = "MP0",
5762
[7][1] = "MP1",
58-
[8][1] = "MPIO",
59-
[10][1] = "DBGU0",
60-
[11][1] = "DBGU1",
61-
[12][1] = "DBGU2",
62-
[13][1] = "DBGU3",
63-
[14][1] = "XDP",
64-
[15][1] = "OSSSYS",
65-
[16][1] = "HDP",
66-
[17][1] = "LSDMA",
67-
[18][1] = "JPEG",
68-
[19][1] = "VCNU0",
69-
[20][1] = "VCN0",
70-
[21][1] = "VSCH",
71-
[22][1] = "VCNU1",
72-
[23][1] = "VCN1",
63+
[8][1] = "MPM",
64+
[10][1] = "ISPMWR0",
65+
[11][1] = "ISPMWR1",
66+
[12][1] = "ISPTNR",
67+
[13][1] = "ISPSWR",
68+
[14][1] = "ISPCWR0",
69+
[15][1] = "ISPCWR1",
70+
[16][1] = "ISPCWR2",
71+
[17][1] = "ISPCWR3",
72+
[18][1] = "XDP",
73+
[21][1] = "OSSSYS",
74+
[22][1] = "HDP",
75+
[23][1] = "LSDMA",
76+
[24][1] = "JPEG",
77+
[27][1] = "VSCH",
78+
[28][1] = "VCNU",
79+
[29][1] = "VCN",
7380
};
7481

7582
static uint32_t mmhub_v3_0_1_get_invalidate_req(unsigned int vmid,

0 commit comments

Comments
 (0)