Skip to content

Commit cc11dff

Browse files
Stanley.Yangalexdeucher
authored andcommitted
drm/amdgpu: Update ta ras block
Update ta ra block to keep sync with RAS TA. Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> Reviewed-by: Tao Zhou <tao.zhou1@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent ee97326 commit cc11dff

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ const char *ras_block_string[] = {
7777
"jpeg",
7878
"ih",
7979
"mpio",
80+
"mmsch",
8081
};
8182

8283
const char *ras_mca_block_string[] = {

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ enum amdgpu_ras_block {
9898
AMDGPU_RAS_BLOCK__JPEG,
9999
AMDGPU_RAS_BLOCK__IH,
100100
AMDGPU_RAS_BLOCK__MPIO,
101+
AMDGPU_RAS_BLOCK__MMSCH,
101102

102103
AMDGPU_RAS_BLOCK__LAST,
103104
AMDGPU_RAS_BLOCK__ANY = -1
@@ -795,6 +796,12 @@ amdgpu_ras_block_to_ta(enum amdgpu_ras_block block) {
795796
return TA_RAS_BLOCK__VCN;
796797
case AMDGPU_RAS_BLOCK__JPEG:
797798
return TA_RAS_BLOCK__JPEG;
799+
case AMDGPU_RAS_BLOCK__IH:
800+
return TA_RAS_BLOCK__IH;
801+
case AMDGPU_RAS_BLOCK__MPIO:
802+
return TA_RAS_BLOCK__MPIO;
803+
case AMDGPU_RAS_BLOCK__MMSCH:
804+
return TA_RAS_BLOCK__MMSCH;
798805
default:
799806
WARN_ONCE(1, "RAS ERROR: unexpected block id %d\n", block);
800807
return TA_RAS_BLOCK__UMC;

drivers/gpu/drm/amd/amdgpu/ta_ras_if.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ enum ta_ras_block {
9292
TA_RAS_BLOCK__MCA,
9393
TA_RAS_BLOCK__VCN,
9494
TA_RAS_BLOCK__JPEG,
95+
TA_RAS_BLOCK__IH,
96+
TA_RAS_BLOCK__MPIO,
97+
TA_RAS_BLOCK__MMSCH,
9598
TA_NUM_BLOCK_MAX
9699
};
97100

0 commit comments

Comments
 (0)