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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index ef38f4c..17b3d19 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -583,6 +583,10 @@ amdgpu_ras_block_to_ta(enum amdgpu_ras_block block) {
                return TA_RAS_BLOCK__FUSE;
        case AMDGPU_RAS_BLOCK__MCA:
                return TA_RAS_BLOCK__MCA;
+       case AMDGPU_RAS_BLOCK__VCN:
+               return TA_RAS_BLOCK__VCN;
+       case AMDGPU_RAS_BLOCK__JPEG:
+               return TA_RAS_BLOCK__JPEG;
        default:
                WARN_ONCE(1, "RAS ERROR: unexpected block id %d\n", block);
                return TA_RAS_BLOCK__UMC;

diff --git a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
index 509d8a1..30d0482 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
+++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
@@ -84,6 +84,8 @@ enum ta_ras_block {
        TA_RAS_BLOCK__MP1,
        TA_RAS_BLOCK__FUSE,
        TA_RAS_BLOCK__MCA,
+       TA_RAS_BLOCK__VCN,
+       TA_RAS_BLOCK__JPEG,
        TA_NUM_BLOCK_MAX
 };