Skip to content

Commit caa4dff

Browse files
Stanley.Yangalexdeucher
authored andcommitted
drm/amdgpu: fix unexpected block id
Aldebaran supports VCN and JPEG RAS, it reports unexpected block id message during VCN and JPEG RAS initialization if VCN and JPEG block id not defined. Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent febc9c6 commit caa4dff

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,10 @@ amdgpu_ras_block_to_ta(enum amdgpu_ras_block block) {
583583
return TA_RAS_BLOCK__FUSE;
584584
case AMDGPU_RAS_BLOCK__MCA:
585585
return TA_RAS_BLOCK__MCA;
586+
case AMDGPU_RAS_BLOCK__VCN:
587+
return TA_RAS_BLOCK__VCN;
588+
case AMDGPU_RAS_BLOCK__JPEG:
589+
return TA_RAS_BLOCK__JPEG;
586590
default:
587591
WARN_ONCE(1, "RAS ERROR: unexpected block id %d\n", block);
588592
return TA_RAS_BLOCK__UMC;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ enum ta_ras_block {
8484
TA_RAS_BLOCK__MP1,
8585
TA_RAS_BLOCK__FUSE,
8686
TA_RAS_BLOCK__MCA,
87+
TA_RAS_BLOCK__VCN,
88+
TA_RAS_BLOCK__JPEG,
8789
TA_NUM_BLOCK_MAX
8890
};
8991

0 commit comments

Comments
 (0)