<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:DengXian;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:"\@DengXian";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
font-size:10.0pt;
font-family:"Calibri",sans-serif;}
span.EmailStyle20
{mso-style-type:personal-compose;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="#0563C1" vlink="#954F72" style="word-wrap:break-word">
<p style="font-family:Arial;font-size:10pt;color:#0000FF;margin:5pt;" align="Left">
[AMD Official Use Only - General]<br>
</p>
<br>
<div>
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt">Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com><o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt">Regards,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt">Hawking<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt"><o:p> </o:p></span></p>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal" style="margin-bottom:12.0pt"><b><span style="font-size:12.0pt;color:black">From:
</span></b><span style="font-size:12.0pt;color:black">Stanley.Yang <Stanley.Yang@amd.com><br>
<b>Date: </b>Monday, April 10, 2023 at 19:48<br>
<b>To: </b>amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>, Zhang, Hawking <Hawking.Zhang@amd.com>, Zhou1, Tao <Tao.Zhou1@amd.com><br>
<b>Cc: </b>Yang, Stanley <Stanley.Yang@amd.com><br>
<b>Subject: </b>[PATCH Review 1/2] drm/admgpu: fix unexpected block id<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-size:11.0pt">Change-Id: Icceb43556eec802f11c2077c1c58a1e92c9df599<br>
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 ++++<br>
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 2 ++<br>
2 files changed, 6 insertions(+)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h<br>
index ef38f4c93df0..17b3d1992e80 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h<br>
@@ -583,6 +583,10 @@ amdgpu_ras_block_to_ta(enum amdgpu_ras_block block) {<br>
return TA_RAS_BLOCK__FUSE;<br>
case AMDGPU_RAS_BLOCK__MCA:<br>
return TA_RAS_BLOCK__MCA;<br>
+ case AMDGPU_RAS_BLOCK__VCN:<br>
+ return TA_RAS_BLOCK__VCN;<br>
+ case AMDGPU_RAS_BLOCK__JPEG:<br>
+ return TA_RAS_BLOCK__JPEG;<br>
default:<br>
WARN_ONCE(1, "RAS ERROR: unexpected block id %d\n", block);<br>
return TA_RAS_BLOCK__UMC;<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h<br>
index 509d8a1945eb..30d0482ac466 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h<br>
+++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h<br>
@@ -84,6 +84,8 @@ enum ta_ras_block {<br>
TA_RAS_BLOCK__MP1,<br>
TA_RAS_BLOCK__FUSE,<br>
TA_RAS_BLOCK__MCA,<br>
+ TA_RAS_BLOCK__VCN,<br>
+ TA_RAS_BLOCK__JPEG,<br>
TA_NUM_BLOCK_MAX<br>
};<br>
<br>
-- <br>
2.17.1<o:p></o:p></span></p>
</div>
</div>
</div>
</body>
</html>