* [PATCH 1/3] drm/amdgpu: update mmhub 3.0.1 client id mappings
@ 2025-07-18 19:57 Alex Deucher
2025-07-18 19:57 ` [PATCH 2/3] drm/amdgpu: update mmhub 3.3 " Alex Deucher
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alex Deucher @ 2025-07-18 19:57 UTC (permalink / raw)
To: amd-gfx, dri-devel; +Cc: Alex Deucher
Update the client id mapping so the correct clients
get printed when there is a mmhub page fault.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 57 +++++++++++++----------
1 file changed, 32 insertions(+), 25 deletions(-)
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 134c4ec108878..910337dc28d10 100644
--- 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,
--
2.50.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] drm/amdgpu: update mmhub 3.3 client id mappings
2025-07-18 19:57 [PATCH 1/3] drm/amdgpu: update mmhub 3.0.1 client id mappings Alex Deucher
@ 2025-07-18 19:57 ` Alex Deucher
2025-07-28 18:00 ` Alex Deucher
2025-07-18 19:57 ` [PATCH 3/3] drm/amdgpu: update mmhub 4.1.0 " Alex Deucher
2025-07-28 18:00 ` [PATCH 1/3] drm/amdgpu: update mmhub 3.0.1 " Alex Deucher
2 siblings, 1 reply; 6+ messages in thread
From: Alex Deucher @ 2025-07-18 19:57 UTC (permalink / raw)
To: amd-gfx, dri-devel; +Cc: Alex Deucher
Update the client id mapping so the correct clients
get printed when there is a mmhub page fault.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 104 +++++++++++++++++++++++-
1 file changed, 103 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
index bc3d6c2fc87a4..9ae811d9a9dd5 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
@@ -40,30 +40,128 @@
static const char *mmhub_client_ids_v3_3[][2] = {
[0][0] = "VMC",
+ [1][0] = "ISPXT",
+ [2][0] = "ISPIXT",
[4][0] = "DCEDMC",
[6][0] = "MP0",
[7][0] = "MP1",
[8][0] = "MPM",
+ [9][0] = "ISPPDPRD",
+ [10][0] = "ISPCSTATRD",
+ [11][0] = "ISPBYRPRD",
+ [12][0] = "ISPRGBPRD",
+ [13][0] = "ISPMCFPRD",
+ [14][0] = "ISPMCFPRD1",
+ [15][0] = "ISPYUVPRD",
+ [16][0] = "ISPMCSCRD",
+ [17][0] = "ISPGDCRD",
+ [18][0] = "ISPMERD",
+ [22][0] = "ISPXT1",
+ [23][0] = "ISPIXT1",
[24][0] = "HDP",
[25][0] = "LSDMA",
[26][0] = "JPEG",
[27][0] = "VPE",
+ [28][0] = "VSCH",
[29][0] = "VCNU",
[30][0] = "VCN",
+ [1][1] = "ISPXT",
+ [2][1] = "ISPIXT",
[3][1] = "DCEDWB",
[4][1] = "DCEDMC",
[6][1] = "MP0",
[7][1] = "MP1",
[8][1] = "MPM",
+ [9][1] = "ISPPDPWR",
+ [10][1] = "ISPCSTATWR",
+ [11][1] = "ISPBYRPWR",
+ [12][1] = "ISPRGBPWR",
+ [13][1] = "ISPMCFPWR",
+ [14][1] = "ISPMCFPWR1",
+ [15][1] = "ISPYUVPWR",
+ [16][1] = "ISPMCSCWR",
+ [17][1] = "ISPGDCWR",
+ [18][1] = "ISPMEWR",
+ [20][1] = "ISPMWR2",
+ [21][1] = "OSSSYS",
+ [22][1] = "ISPXT1",
+ [23][1] = "ISPIXT1",
[21][1] = "OSSSYS",
[24][1] = "HDP",
[25][1] = "LSDMA",
[26][1] = "JPEG",
[27][1] = "VPE",
+ [28][1] = "VSCH",
[29][1] = "VCNU",
[30][1] = "VCN",
};
+static const char *mmhub_client_ids_v3_3_1[][2] = {
+ [0][0] = "VMC",
+ [4][0] = "DCEDMC",
+ [6][0] = "MP0",
+ [7][0] = "MP1",
+ [8][0] = "MPM",
+ [24][0] = "HDP",
+ [25][0] = "LSDMA",
+ [26][0] = "JPEG0",
+ [27][0] = "VPE0",
+ [28][0] = "VSCH",
+ [29][0] = "VCNU0",
+ [30][0] = "VCN0",
+ [32+1][0] = "ISPXT",
+ [32+2][0] = "ISPIXT",
+ [32+9][0] = "ISPPDPRD",
+ [32+10][0] = "ISPCSTATRD",
+ [32+11][0] = "ISPBYRPRD",
+ [32+12][0] = "ISPRGBPRD",
+ [32+13][0] = "ISPMCFPRD",
+ [32+14][0] = "ISPMCFPRD1",
+ [32+15][0] = "ISPYUVPRD",
+ [32+16][0] = "ISPMCSCRD",
+ [32+17][0] = "ISPGDCRD",
+ [32+18][0] = "ISPMERD",
+ [32+22][0] = "ISPXT1",
+ [32+23][0] = "ISPIXT1",
+ [32+26][0] = "JPEG1",
+ [32+27][0] = "VPE1",
+ [32+29][0] = "VCNU1",
+ [32+30][0] = "VCN1",
+ [3][1] = "DCEDWB",
+ [4][1] = "DCEDMC",
+ [6][1] = "MP0",
+ [7][1] = "MP1",
+ [8][1] = "MPM",
+ [21][1] = "OSSSYS",
+ [24][1] = "HDP",
+ [25][1] = "LSDMA",
+ [26][1] = "JPEG0",
+ [27][1] = "VPE0",
+ [28][1] = "VSCH",
+ [29][1] = "VCNU0",
+ [30][1] = "VCN0",
+ [32+1][1] = "ISPXT",
+ [32+2][1] = "ISPIXT",
+ [32+9][1] = "ISPPDPWR",
+ [32+10][1] = "ISPCSTATWR",
+ [32+11][1] = "ISPBYRPWR",
+ [32+12][1] = "ISPRGBPWR",
+ [32+13][1] = "ISPMCFPWR",
+ [32+14][1] = "ISPMCFPWR1",
+ [32+15][1] = "ISPYUVPWR",
+ [32+16][1] = "ISPMCSCWR",
+ [32+17][1] = "ISPGDCWR",
+ [32+18][1] = "ISPMEWR",
+ [32+19][1] = "ISPMWR1",
+ [32+20][1] = "ISPMWR2",
+ [32+22][1] = "ISPXT1",
+ [32+23][1] = "ISPIXT1",
+ [32+26][1] = "JPEG1",
+ [32+27][1] = "VPE1",
+ [32+29][1] = "VCNU1",
+ [32+30][1] = "VCN1",
+};
+
static uint32_t mmhub_v3_3_get_invalidate_req(unsigned int vmid,
uint32_t flush_type)
{
@@ -102,12 +200,16 @@ mmhub_v3_3_print_l2_protection_fault_status(struct amdgpu_device *adev,
switch (amdgpu_ip_version(adev, MMHUB_HWIP, 0)) {
case IP_VERSION(3, 3, 0):
- case IP_VERSION(3, 3, 1):
case IP_VERSION(3, 3, 2):
mmhub_cid = cid < ARRAY_SIZE(mmhub_client_ids_v3_3) ?
mmhub_client_ids_v3_3[cid][rw] :
cid == 0x140 ? "UMSCH" : NULL;
break;
+ case IP_VERSION(3, 3, 1):
+ mmhub_cid = cid < ARRAY_SIZE(mmhub_client_ids_v3_3_1) ?
+ mmhub_client_ids_v3_3_1[cid][rw] :
+ cid == 0x140 ? "UMSCH" : NULL;
+ break;
default:
mmhub_cid = NULL;
break;
--
2.50.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] drm/amdgpu: update mmhub 4.1.0 client id mappings
2025-07-18 19:57 [PATCH 1/3] drm/amdgpu: update mmhub 3.0.1 client id mappings Alex Deucher
2025-07-18 19:57 ` [PATCH 2/3] drm/amdgpu: update mmhub 3.3 " Alex Deucher
@ 2025-07-18 19:57 ` Alex Deucher
2025-07-18 20:46 ` Wu, David
2025-07-28 18:00 ` [PATCH 1/3] drm/amdgpu: update mmhub 3.0.1 " Alex Deucher
2 siblings, 1 reply; 6+ messages in thread
From: Alex Deucher @ 2025-07-18 19:57 UTC (permalink / raw)
To: amd-gfx, dri-devel; +Cc: Alex Deucher
Update the client id mapping so the correct clients
get printed when there is a mmhub page fault.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 34 +++++++++--------------
1 file changed, 13 insertions(+), 21 deletions(-)
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 f2ab5001b4924..951998454b257 100644
--- 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,
--
2.50.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] drm/amdgpu: update mmhub 4.1.0 client id mappings
2025-07-18 19:57 ` [PATCH 3/3] drm/amdgpu: update mmhub 4.1.0 " Alex Deucher
@ 2025-07-18 20:46 ` Wu, David
0 siblings, 0 replies; 6+ messages in thread
From: Wu, David @ 2025-07-18 20:46 UTC (permalink / raw)
To: Alex Deucher, amd-gfx, dri-devel
[-- Attachment #1: Type: text/plain, Size: 1951 bytes --]
thanks!
Tested-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
Reviewed-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
On 7/18/2025 3:57 PM, Alex Deucher wrote:
> Update the client id mapping so the correct clients
> get printed when there is a mmhub page fault.
>
> Signed-off-by: Alex Deucher<alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 34 +++++++++--------------
> 1 file changed, 13 insertions(+), 21 deletions(-)
>
> 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 f2ab5001b4924..951998454b257 100644
> --- 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,
[-- Attachment #2: Type: text/html, Size: 2965 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] drm/amdgpu: update mmhub 3.0.1 client id mappings
2025-07-18 19:57 [PATCH 1/3] drm/amdgpu: update mmhub 3.0.1 client id mappings Alex Deucher
2025-07-18 19:57 ` [PATCH 2/3] drm/amdgpu: update mmhub 3.3 " Alex Deucher
2025-07-18 19:57 ` [PATCH 3/3] drm/amdgpu: update mmhub 4.1.0 " Alex Deucher
@ 2025-07-28 18:00 ` Alex Deucher
2 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2025-07-28 18:00 UTC (permalink / raw)
To: Alex Deucher; +Cc: amd-gfx, dri-devel
ping?
On Fri, Jul 18, 2025 at 4:08 PM Alex Deucher <alexander.deucher@amd.com> wrote:
>
> Update the client id mapping so the correct clients
> get printed when there is a mmhub page fault.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 57 +++++++++++++----------
> 1 file changed, 32 insertions(+), 25 deletions(-)
>
> 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 134c4ec108878..910337dc28d10 100644
> --- 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,
> --
> 2.50.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] drm/amdgpu: update mmhub 3.3 client id mappings
2025-07-18 19:57 ` [PATCH 2/3] drm/amdgpu: update mmhub 3.3 " Alex Deucher
@ 2025-07-28 18:00 ` Alex Deucher
0 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2025-07-28 18:00 UTC (permalink / raw)
To: Alex Deucher; +Cc: amd-gfx, dri-devel
ping?
On Fri, Jul 18, 2025 at 4:08 PM Alex Deucher <alexander.deucher@amd.com> wrote:
>
> Update the client id mapping so the correct clients
> get printed when there is a mmhub page fault.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 104 +++++++++++++++++++++++-
> 1 file changed, 103 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
> index bc3d6c2fc87a4..9ae811d9a9dd5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c
> @@ -40,30 +40,128 @@
>
> static const char *mmhub_client_ids_v3_3[][2] = {
> [0][0] = "VMC",
> + [1][0] = "ISPXT",
> + [2][0] = "ISPIXT",
> [4][0] = "DCEDMC",
> [6][0] = "MP0",
> [7][0] = "MP1",
> [8][0] = "MPM",
> + [9][0] = "ISPPDPRD",
> + [10][0] = "ISPCSTATRD",
> + [11][0] = "ISPBYRPRD",
> + [12][0] = "ISPRGBPRD",
> + [13][0] = "ISPMCFPRD",
> + [14][0] = "ISPMCFPRD1",
> + [15][0] = "ISPYUVPRD",
> + [16][0] = "ISPMCSCRD",
> + [17][0] = "ISPGDCRD",
> + [18][0] = "ISPMERD",
> + [22][0] = "ISPXT1",
> + [23][0] = "ISPIXT1",
> [24][0] = "HDP",
> [25][0] = "LSDMA",
> [26][0] = "JPEG",
> [27][0] = "VPE",
> + [28][0] = "VSCH",
> [29][0] = "VCNU",
> [30][0] = "VCN",
> + [1][1] = "ISPXT",
> + [2][1] = "ISPIXT",
> [3][1] = "DCEDWB",
> [4][1] = "DCEDMC",
> [6][1] = "MP0",
> [7][1] = "MP1",
> [8][1] = "MPM",
> + [9][1] = "ISPPDPWR",
> + [10][1] = "ISPCSTATWR",
> + [11][1] = "ISPBYRPWR",
> + [12][1] = "ISPRGBPWR",
> + [13][1] = "ISPMCFPWR",
> + [14][1] = "ISPMCFPWR1",
> + [15][1] = "ISPYUVPWR",
> + [16][1] = "ISPMCSCWR",
> + [17][1] = "ISPGDCWR",
> + [18][1] = "ISPMEWR",
> + [20][1] = "ISPMWR2",
> + [21][1] = "OSSSYS",
> + [22][1] = "ISPXT1",
> + [23][1] = "ISPIXT1",
> [21][1] = "OSSSYS",
> [24][1] = "HDP",
> [25][1] = "LSDMA",
> [26][1] = "JPEG",
> [27][1] = "VPE",
> + [28][1] = "VSCH",
> [29][1] = "VCNU",
> [30][1] = "VCN",
> };
>
> +static const char *mmhub_client_ids_v3_3_1[][2] = {
> + [0][0] = "VMC",
> + [4][0] = "DCEDMC",
> + [6][0] = "MP0",
> + [7][0] = "MP1",
> + [8][0] = "MPM",
> + [24][0] = "HDP",
> + [25][0] = "LSDMA",
> + [26][0] = "JPEG0",
> + [27][0] = "VPE0",
> + [28][0] = "VSCH",
> + [29][0] = "VCNU0",
> + [30][0] = "VCN0",
> + [32+1][0] = "ISPXT",
> + [32+2][0] = "ISPIXT",
> + [32+9][0] = "ISPPDPRD",
> + [32+10][0] = "ISPCSTATRD",
> + [32+11][0] = "ISPBYRPRD",
> + [32+12][0] = "ISPRGBPRD",
> + [32+13][0] = "ISPMCFPRD",
> + [32+14][0] = "ISPMCFPRD1",
> + [32+15][0] = "ISPYUVPRD",
> + [32+16][0] = "ISPMCSCRD",
> + [32+17][0] = "ISPGDCRD",
> + [32+18][0] = "ISPMERD",
> + [32+22][0] = "ISPXT1",
> + [32+23][0] = "ISPIXT1",
> + [32+26][0] = "JPEG1",
> + [32+27][0] = "VPE1",
> + [32+29][0] = "VCNU1",
> + [32+30][0] = "VCN1",
> + [3][1] = "DCEDWB",
> + [4][1] = "DCEDMC",
> + [6][1] = "MP0",
> + [7][1] = "MP1",
> + [8][1] = "MPM",
> + [21][1] = "OSSSYS",
> + [24][1] = "HDP",
> + [25][1] = "LSDMA",
> + [26][1] = "JPEG0",
> + [27][1] = "VPE0",
> + [28][1] = "VSCH",
> + [29][1] = "VCNU0",
> + [30][1] = "VCN0",
> + [32+1][1] = "ISPXT",
> + [32+2][1] = "ISPIXT",
> + [32+9][1] = "ISPPDPWR",
> + [32+10][1] = "ISPCSTATWR",
> + [32+11][1] = "ISPBYRPWR",
> + [32+12][1] = "ISPRGBPWR",
> + [32+13][1] = "ISPMCFPWR",
> + [32+14][1] = "ISPMCFPWR1",
> + [32+15][1] = "ISPYUVPWR",
> + [32+16][1] = "ISPMCSCWR",
> + [32+17][1] = "ISPGDCWR",
> + [32+18][1] = "ISPMEWR",
> + [32+19][1] = "ISPMWR1",
> + [32+20][1] = "ISPMWR2",
> + [32+22][1] = "ISPXT1",
> + [32+23][1] = "ISPIXT1",
> + [32+26][1] = "JPEG1",
> + [32+27][1] = "VPE1",
> + [32+29][1] = "VCNU1",
> + [32+30][1] = "VCN1",
> +};
> +
> static uint32_t mmhub_v3_3_get_invalidate_req(unsigned int vmid,
> uint32_t flush_type)
> {
> @@ -102,12 +200,16 @@ mmhub_v3_3_print_l2_protection_fault_status(struct amdgpu_device *adev,
>
> switch (amdgpu_ip_version(adev, MMHUB_HWIP, 0)) {
> case IP_VERSION(3, 3, 0):
> - case IP_VERSION(3, 3, 1):
> case IP_VERSION(3, 3, 2):
> mmhub_cid = cid < ARRAY_SIZE(mmhub_client_ids_v3_3) ?
> mmhub_client_ids_v3_3[cid][rw] :
> cid == 0x140 ? "UMSCH" : NULL;
> break;
> + case IP_VERSION(3, 3, 1):
> + mmhub_cid = cid < ARRAY_SIZE(mmhub_client_ids_v3_3_1) ?
> + mmhub_client_ids_v3_3_1[cid][rw] :
> + cid == 0x140 ? "UMSCH" : NULL;
> + break;
> default:
> mmhub_cid = NULL;
> break;
> --
> 2.50.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-07-28 18:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-18 19:57 [PATCH 1/3] drm/amdgpu: update mmhub 3.0.1 client id mappings Alex Deucher
2025-07-18 19:57 ` [PATCH 2/3] drm/amdgpu: update mmhub 3.3 " Alex Deucher
2025-07-28 18:00 ` Alex Deucher
2025-07-18 19:57 ` [PATCH 3/3] drm/amdgpu: update mmhub 4.1.0 " Alex Deucher
2025-07-18 20:46 ` Wu, David
2025-07-28 18:00 ` [PATCH 1/3] drm/amdgpu: update mmhub 3.0.1 " Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).