tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdgpu: update mmhub 3.3 client id mappings
Update the client id mapping so the correct clients
get printed when there is a mmhub page fault.
v2: fix typos spotted by David Wu.
v3: fix additional typo spotted by David.
Reviewed-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+112
-9
+112
-9
drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
+112
-9
drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
···
40
40
41
41
static const char *mmhub_client_ids_v3_3[][2] = {
42
42
[0][0] = "VMC",
43
+
[1][0] = "ISPXT",
44
+
[2][0] = "ISPIXT",
45
+
[4][0] = "DCEDMC",
46
+
[6][0] = "MP0",
47
+
[7][0] = "MP1",
48
+
[8][0] = "MPM",
49
+
[9][0] = "ISPPDPRD",
50
+
[10][0] = "ISPCSTATRD",
51
+
[11][0] = "ISPBYRPRD",
52
+
[12][0] = "ISPRGBPRD",
53
+
[13][0] = "ISPMCFPRD",
54
+
[14][0] = "ISPMCFPRD1",
55
+
[15][0] = "ISPYUVPRD",
56
+
[16][0] = "ISPMCSCRD",
57
+
[17][0] = "ISPGDCRD",
58
+
[18][0] = "ISPLMERD",
59
+
[22][0] = "ISPXT1",
60
+
[23][0] = "ISPIXT1",
61
+
[24][0] = "HDP",
62
+
[25][0] = "LSDMA",
63
+
[26][0] = "JPEG",
64
+
[27][0] = "VPE",
65
+
[28][0] = "VSCH",
66
+
[29][0] = "VCNU",
67
+
[30][0] = "VCN",
68
+
[1][1] = "ISPXT",
69
+
[2][1] = "ISPIXT",
70
+
[3][1] = "DCEDWB",
71
+
[4][1] = "DCEDMC",
72
+
[5][1] = "ISPCSISWR",
73
+
[6][1] = "MP0",
74
+
[7][1] = "MP1",
75
+
[8][1] = "MPM",
76
+
[9][1] = "ISPPDPWR",
77
+
[10][1] = "ISPCSTATWR",
78
+
[11][1] = "ISPBYRPWR",
79
+
[12][1] = "ISPRGBPWR",
80
+
[13][1] = "ISPMCFPWR",
81
+
[14][1] = "ISPMWR0",
82
+
[15][1] = "ISPYUVPWR",
83
+
[16][1] = "ISPMCSCWR",
84
+
[17][1] = "ISPGDCWR",
85
+
[18][1] = "ISPLMEWR",
86
+
[20][1] = "ISPMWR2",
87
+
[21][1] = "OSSSYS",
88
+
[22][1] = "ISPXT1",
89
+
[23][1] = "ISPIXT1",
90
+
[24][1] = "HDP",
91
+
[25][1] = "LSDMA",
92
+
[26][1] = "JPEG",
93
+
[27][1] = "VPE",
94
+
[28][1] = "VSCH",
95
+
[29][1] = "VCNU",
96
+
[30][1] = "VCN",
97
+
};
98
+
99
+
static const char *mmhub_client_ids_v3_3_1[][2] = {
100
+
[0][0] = "VMC",
43
101
[4][0] = "DCEDMC",
44
102
[6][0] = "MP0",
45
103
[7][0] = "MP1",
46
104
[8][0] = "MPM",
47
105
[24][0] = "HDP",
48
106
[25][0] = "LSDMA",
49
-
[26][0] = "JPEG",
50
-
[27][0] = "VPE",
51
-
[29][0] = "VCNU",
52
-
[30][0] = "VCN",
107
+
[26][0] = "JPEG0",
108
+
[27][0] = "VPE0",
109
+
[28][0] = "VSCH",
110
+
[29][0] = "VCNU0",
111
+
[30][0] = "VCN0",
112
+
[32+1][0] = "ISPXT",
113
+
[32+2][0] = "ISPIXT",
114
+
[32+9][0] = "ISPPDPRD",
115
+
[32+10][0] = "ISPCSTATRD",
116
+
[32+11][0] = "ISPBYRPRD",
117
+
[32+12][0] = "ISPRGBPRD",
118
+
[32+13][0] = "ISPMCFPRD",
119
+
[32+14][0] = "ISPMCFPRD1",
120
+
[32+15][0] = "ISPYUVPRD",
121
+
[32+16][0] = "ISPMCSCRD",
122
+
[32+17][0] = "ISPGDCRD",
123
+
[32+18][0] = "ISPLMERD",
124
+
[32+22][0] = "ISPXT1",
125
+
[32+23][0] = "ISPIXT1",
126
+
[32+26][0] = "JPEG1",
127
+
[32+27][0] = "VPE1",
128
+
[32+29][0] = "VCNU1",
129
+
[32+30][0] = "VCN1",
53
130
[3][1] = "DCEDWB",
54
131
[4][1] = "DCEDMC",
55
132
[6][1] = "MP0",
···
135
58
[21][1] = "OSSSYS",
136
59
[24][1] = "HDP",
137
60
[25][1] = "LSDMA",
138
-
[26][1] = "JPEG",
139
-
[27][1] = "VPE",
140
-
[29][1] = "VCNU",
141
-
[30][1] = "VCN",
61
+
[26][1] = "JPEG0",
62
+
[27][1] = "VPE0",
63
+
[28][1] = "VSCH",
64
+
[29][1] = "VCNU0",
65
+
[30][1] = "VCN0",
66
+
[32+1][1] = "ISPXT",
67
+
[32+2][1] = "ISPIXT",
68
+
[32+5][1] = "ISPCSISWR",
69
+
[32+9][1] = "ISPPDPWR",
70
+
[32+10][1] = "ISPCSTATWR",
71
+
[32+11][1] = "ISPBYRPWR",
72
+
[32+12][1] = "ISPRGBPWR",
73
+
[32+13][1] = "ISPMCFPWR",
74
+
[32+14][1] = "ISPMWR0",
75
+
[32+15][1] = "ISPYUVPWR",
76
+
[32+16][1] = "ISPMCSCWR",
77
+
[32+17][1] = "ISPGDCWR",
78
+
[32+18][1] = "ISPLMEWR",
79
+
[32+19][1] = "ISPMWR1",
80
+
[32+20][1] = "ISPMWR2",
81
+
[32+22][1] = "ISPXT1",
82
+
[32+23][1] = "ISPIXT1",
83
+
[32+26][1] = "JPEG1",
84
+
[32+27][1] = "VPE1",
85
+
[32+29][1] = "VCNU1",
86
+
[32+30][1] = "VCN1",
142
87
};
143
88
144
89
static uint32_t mmhub_v3_3_get_invalidate_req(unsigned int vmid,
···
201
102
202
103
switch (amdgpu_ip_version(adev, MMHUB_HWIP, 0)) {
203
104
case IP_VERSION(3, 3, 0):
204
-
case IP_VERSION(3, 3, 1):
205
105
case IP_VERSION(3, 3, 2):
206
106
mmhub_cid = cid < ARRAY_SIZE(mmhub_client_ids_v3_3) ?
207
107
mmhub_client_ids_v3_3[cid][rw] :
108
+
cid == 0x140 ? "UMSCH" : NULL;
109
+
break;
110
+
case IP_VERSION(3, 3, 1):
111
+
mmhub_cid = cid < ARRAY_SIZE(mmhub_client_ids_v3_3_1) ?
112
+
mmhub_client_ids_v3_3_1[cid][rw] :
208
113
cid == 0x140 ? "UMSCH" : NULL;
209
114
break;
210
115
default: