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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index bed2603ae4c4386cfa645daee820fb317022c141..ebf1f63d0442747d4b8fed7bd5e6e702dfcc56d0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -77,6 +77,7 @@ const char *ras_block_string[] = {
        "jpeg",
        "ih",
        "mpio",
+       "mmsch",
 };
 
 const char *ras_mca_block_string[] = {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index 764e9fa0a914af11a89c6863284952437cd6ed79..927d6bff734ae9160074cb5e2b2a182a7337e7e7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -98,6 +98,7 @@ enum amdgpu_ras_block {
        AMDGPU_RAS_BLOCK__JPEG,
        AMDGPU_RAS_BLOCK__IH,
        AMDGPU_RAS_BLOCK__MPIO,
+       AMDGPU_RAS_BLOCK__MMSCH,
 
        AMDGPU_RAS_BLOCK__LAST,
        AMDGPU_RAS_BLOCK__ANY = -1
@@ -795,6 +796,12 @@ amdgpu_ras_block_to_ta(enum amdgpu_ras_block block) {
                return TA_RAS_BLOCK__VCN;
        case AMDGPU_RAS_BLOCK__JPEG:
                return TA_RAS_BLOCK__JPEG;
+       case AMDGPU_RAS_BLOCK__IH:
+               return TA_RAS_BLOCK__IH;
+       case AMDGPU_RAS_BLOCK__MPIO:
+               return TA_RAS_BLOCK__MPIO;
+       case AMDGPU_RAS_BLOCK__MMSCH:
+               return TA_RAS_BLOCK__MMSCH;
        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 a3b5fda224328bfbf28999a19c0322bff9e4d860..8a3f326474e54dba88adfba1032ea22db1dd9f62 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
+++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h
@@ -92,6 +92,9 @@ enum ta_ras_block {
        TA_RAS_BLOCK__MCA,
        TA_RAS_BLOCK__VCN,
        TA_RAS_BLOCK__JPEG,
+       TA_RAS_BLOCK__IH,
+       TA_RAS_BLOCK__MPIO,
+       TA_RAS_BLOCK__MMSCH,
        TA_NUM_BLOCK_MAX
 };