[AMD Official Use Only - AMD Internal Distribution Only]
Reviewed-by: Tao Zhou <tao.zh...@amd.com>
> -----Original Message-----
> From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> On Behalf Of
> Stanley.Yang
> Sent: Tuesday, March 25, 2025 12:06 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Yang, Stanley <stanley.y...@amd.com>
> Subject: [PATCH Review 1/1] drm/amdgpu: Update ta ras block
>
> Update ta ra block to keep sync with RAS TA.
>
> Signed-off-by: Stanley.Yang <stanley.y...@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1 +
> drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 7 +++++++
> drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 +++
> 3 files changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> index 5b4ffcd37ba8..e85143acf3a2 100644
> --- 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 764e9fa0a914..927d6bff734a 100644
> --- 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 a3b5fda22432..8a3f326474e5 100644
> --- 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
> };
>
> --
> 2.25.1
