<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=iso-2022-jp">
<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;}
@font-face
{font-family:"Microsoft YaHei";
panose-1:2 11 5 3 2 2 4 2 2 4;}
@font-face
{font-family:"\@Microsoft YaHei";}
@font-face
{font-family:"MS PGothic";
panose-1:2 11 6 0 7 2 5 8 2 4;}
@font-face
{font-family:"\@MS PGothic";}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
font-size:12.0pt;
font-family:"MS PGothic",sans-serif;
mso-fareast-language:JA;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0in;
font-size:12.0pt;
font-family:"Calibri",sans-serif;
mso-fareast-language:JA;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Calibri",sans-serif;}
p.msipheadera4477989, li.msipheadera4477989, div.msipheadera4477989
{mso-style-name:msipheadera4477989;
mso-margin-top-alt:auto;
margin-right:0in;
mso-margin-bottom-alt:auto;
margin-left:0in;
font-size:12.0pt;
font-family:"MS PGothic",sans-serif;
mso-fareast-language:JA;}
span.EmailStyle21
{mso-style-type:personal-compose;
font-family:"Arial",sans-serif;
color:blue;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 113.7pt 1.0in 113.7pt;}
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">
<div class="WordSection1">
<p class="msipheadera4477989" style="margin:0in"><span style="font-size:10.0pt;font-family:"Arial",sans-serif;color:blue">[AMD Official Use Only]</span><o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoPlainText">Tim<span lang="ZH-CN" style="font-family:"Microsoft YaHei",sans-serif;mso-fareast-language:ZH-CN">，</span><o:p></o:p></p>
<p class="MsoPlainText">Please remove TAB in the beginning of an empty line and the SPACE in the end of a line.
<o:p></o:p></p>
<p class="MsoPlainText">With this fixed, series is:<span style="font-family:DengXian"><br>
</span>Reviewed-by: Aaron Liu <a href="mailto:aaron.liu@amd.com">aaron.liu@amd.com</a><o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">--<o:p></o:p></p>
<p class="MsoPlainText">Best Regards<o:p></o:p></p>
<p class="MsoPlainText">Aaron Liu<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">> -----Original Message-----<o:p></o:p></p>
<p class="MsoPlainText">> From: Huang, Tim <Tim.Huang@amd.com><o:p></o:p></p>
<p class="MsoPlainText">> Sent: Monday, January 24, 2022 11:21 AM<o:p></o:p></p>
<p class="MsoPlainText">> To: amd-gfx@lists.freedesktop.org<o:p></o:p></p>
<p class="MsoPlainText">> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Huang, Ray<o:p></o:p></p>
<p class="MsoPlainText">> <Ray.Huang@amd.com>; Liu, Aaron <Aaron.Liu@amd.com>; Huang, Tim<o:p></o:p></p>
<p class="MsoPlainText">> <Tim.Huang@amd.com><o:p></o:p></p>
<p class="MsoPlainText">> Subject: [PATCH 3/3] drm/amd/display: convert to DCE IP version checking<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> Use IP versions rather than asic_type to differentiate IP version specific<o:p></o:p></p>
<p class="MsoPlainText">> features.<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> Signed-off-by: Tim Huang <<a href="mailto:xiaohu.huang@amd.com"><span style="color:windowtext;text-decoration:none">xiaohu.huang@amd.com</span></a>><o:p></o:p></p>
<p class="MsoPlainText">> ---<o:p></o:p></p>
<p class="MsoPlainText">> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 12 +++++-------<o:p></o:p></p>
<p class="MsoPlainText">> 1 file changed, 5 insertions(+), 7 deletions(-)<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<o:p></o:p></p>
<p class="MsoPlainText">> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<o:p></o:p></p>
<p class="MsoPlainText">> index 87299e62fe12..c967e1e344e4 100644<o:p></o:p></p>
<p class="MsoPlainText">> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<o:p></o:p></p>
<p class="MsoPlainText">> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<o:p></o:p></p>
<p class="MsoPlainText">> @@ -1119,19 +1119,17 @@ static int dm_dmub_hw_init(struct<o:p></o:p></p>
<p class="MsoPlainText">> amdgpu_device *adev)<o:p></o:p></p>
<p class="MsoPlainText">> for (i = 0; i < fb_info->num_fb; ++i)<o:p></o:p></p>
<p class="MsoPlainText">> hw_params.fb[i] = &fb_info->fb[i];<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> - switch (adev->asic_type) {<o:p></o:p></p>
<p class="MsoPlainText">> - case CHIP_YELLOW_CARP:<o:p></o:p></p>
<p class="MsoPlainText">> - if (dc->ctx->asic_id.hw_internal_rev != YELLOW_CARP_A0) {<o:p></o:p></p>
<p class="MsoPlainText">> - hw_params.dpia_supported = true;<o:p></o:p></p>
<p class="MsoPlainText">> + switch (adev->ip_versions[DCE_HWIP][0]) {<o:p></o:p></p>
<p class="MsoPlainText">> + case IP_VERSION(3, 1, 3): /* Only for this asic hw internal rev B0 */<o:p></o:p></p>
<p class="MsoPlainText">> + hw_params.dpia_supported = true;<o:p></o:p></p>
<p class="MsoPlainText">> #if defined(CONFIG_DRM_AMD_DC_DCN)<o:p></o:p></p>
<p class="MsoPlainText">> - hw_params.disable_dpia = dc-<o:p></o:p></p>
<p class="MsoPlainText">> >debug.dpia_debug.bits.disable_dpia;<o:p></o:p></p>
<p class="MsoPlainText">> + hw_params.disable_dpia = dc-<o:p></o:p></p>
<p class="MsoPlainText">> >debug.dpia_debug.bits.disable_dpia;<o:p></o:p></p>
<p class="MsoPlainText">> #endif<o:p></o:p></p>
<p class="MsoPlainText">> - }<o:p></o:p></p>
<p class="MsoPlainText">> break;<o:p></o:p></p>
<p class="MsoPlainText">> default:<o:p></o:p></p>
<p class="MsoPlainText">> break;<o:p></o:p></p>
<p class="MsoPlainText">> }<o:p></o:p></p>
<p class="MsoPlainText">> -<o:p></o:p></p>
<p class="MsoPlainText">> +<o:p></o:p></p>
<p class="MsoPlainText">> status = dmub_srv_hw_init(dmub_srv, &hw_params);<o:p></o:p></p>
<p class="MsoPlainText">> if (status != DMUB_STATUS_OK) {<o:p></o:p></p>
<p class="MsoPlainText">> DRM_ERROR("Error initializing DMUB HW: %d\n", status);<o:p></o:p></p>
<p class="MsoPlainText">> --<o:p></o:p></p>
<p class="MsoPlainText">> 2.25.1<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
</div>
</body>
</html>