[PATCH Review 1/2] drm/admgpu: fix unexpected block id

[Zhang, Hawking]

[AMD Official Use Only - General]

Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>

Regards,
Hawking

From: Stanley.Yang <Stanley.Yang at amd.com>
Date: Monday, April 10, 2023 at 19:48
To: amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>, Zhang, Hawking <Hawking.Zhang at amd.com>, Zhou1, Tao <Tao.Zhou1 at amd.com>
Cc: Yang, Stanley <Stanley.Yang at amd.com>
Subject: [PATCH Review 1/2] drm/admgpu: fix unexpected block id
Change-Id: Icceb43556eec802f11c2077c1c58a1e92c9df599
Signed-off-by: Stanley.Yang <Stanley.Yang at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 ++++
 drivers/gpu/drm/amd/amdgpu/ta_ras_if.h  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index ef38f4c93df0..17b3d1992e80 100644
--- 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 509d8a1945eb..30d0482ac466 100644
--- 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
 };

--
2.17.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20230411/67af66fd/attachment-0001.htm>