<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)">
<!--[if !mso]><style>v\:* {behavior:url(#default#VML);}
o\:* {behavior:url(#default#VML);}
w\:* {behavior:url(#default#VML);}
.shape {behavior:url(#default#VML);}
</style><![endif]--><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:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
p.msipheader23c54b6f, li.msipheader23c54b6f, div.msipheader23c54b6f
{mso-style-name:msipheader23c54b6f;
mso-margin-top-alt:auto;
margin-right:0in;
mso-margin-bottom-alt:auto;
margin-left:0in;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
.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">
<div class="WordSection1">
<p class="msipheader23c54b6f" style="margin:0in"><span style="font-size:10.0pt;font-family:"Arial",sans-serif;color:green">[Public]</span><o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Hi Alex,<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Thank you for the advice! Last week’s DC candidate has in fact already been merged to upstream, but I will bring up your suggestion to the patch author for review.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Thank you,<o:p></o:p></p>
<p class="MsoNormal">Lillian<o:p></o:p></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b>From:</b> Deucher, Alexander <Alexander.Deucher@amd.com> <br>
<b>Sent:</b> Monday, November 22, 2021 10:38 AM<br>
<b>To:</b> Zhuo, Qingqing (Lillian) <Qingqing.Zhuo@amd.com>; amd-gfx@lists.freedesktop.org<br>
<b>Cc:</b> Wang, Chao-kai (Stylon) <Stylon.Wang@amd.com>; Cyr, Aric <Aric.Cyr@amd.com>; Chiu, Solomon <Solomon.Chiu@amd.com>; Li, Sun peng (Leo) <Sunpeng.Li@amd.com>; Wentland, Harry <Harry.Wentland@amd.com>; Leung, Martin <Martin.Leung@amd.com>; Siqueira,
Rodrigo <Rodrigo.Siqueira@amd.com>; Li, Roman <Roman.Li@amd.com>; Jacob, Anson <Anson.Jacob@amd.com>; Pillai, Aurabindo <Aurabindo.Pillai@amd.com>; Lin, Wayne <Wayne.Lin@amd.com>; Lipski, Mikita <Mikita.Lipski@amd.com>; Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com>;
Gutierrez, Agustin <Agustin.Gutierrez@amd.com>; Kotarac, Pavle <Pavle.Kotarac@amd.com><br>
<b>Subject:</b> Re: [PATCH 14/16] drm/amd/display: add else to avoid double destroy clk_mgr<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p style="margin:15.0pt"><span style="font-size:10.0pt;font-family:"Arial",sans-serif;color:green">[Public]<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div>
<p class="MsoNormal"><span style="font-size:12.0pt;color:black">Do you want to change the
</span><span style="color:black">ASICREV_IS_BEIGE_GOBY_P</span><span style="font-size:12.0pt;color:black">() check to else if as well? maybe something like:<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:12.0pt;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:12.0pt;color:black">if (ASICREV_IS_SIENNA_CICHLID_P(clk_mgr_base->ctx->asic_id.hw_internal_rev) ||<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:12.0pt;color:black"> ASICREV_IS_DIMGREY_CAVEFISH_P(clk_mgr_base->ctx->asic_id.hw_internal_rev) ||<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:12.0pt;color:black"> ASICREV_IS_BEIGE_GOBY_P(clk_mgr_base->ctx->asic_id.hw_internal_rev))<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:12.0pt;color:black"> dcn3_clk_mgr_destroy(clk_mgr);<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:12.0pt;color:black"><o:p> </o:p></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-size:12.0pt;color:black">Alex<o:p></o:p></span></p>
</div>
<div class="MsoNormal" align="center" style="text-align:center">
<hr size="2" width="98%" align="center">
</div>
<div id="divRplyFwdMsg">
<p class="MsoNormal"><b><span style="color:black">From:</span></b><span style="color:black"> amd-gfx <<a href="mailto:amd-gfx-bounces@lists.freedesktop.org">amd-gfx-bounces@lists.freedesktop.org</a>> on behalf of Qingqing Zhuo <<a href="mailto:qingqing.zhuo@amd.com">qingqing.zhuo@amd.com</a>><br>
<b>Sent:</b> Friday, November 19, 2021 2:43 PM<br>
<b>To:</b> <a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a> <<a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a>><br>
<b>Cc:</b> Wang, Chao-kai (Stylon) <<a href="mailto:Stylon.Wang@amd.com">Stylon.Wang@amd.com</a>>; Cyr, Aric <<a href="mailto:Aric.Cyr@amd.com">Aric.Cyr@amd.com</a>>; Chiu, Solomon <<a href="mailto:Solomon.Chiu@amd.com">Solomon.Chiu@amd.com</a>>; Li, Sun peng
(Leo) <<a href="mailto:Sunpeng.Li@amd.com">Sunpeng.Li@amd.com</a>>; Wentland, Harry <<a href="mailto:Harry.Wentland@amd.com">Harry.Wentland@amd.com</a>>; Zhuo, Qingqing (Lillian) <<a href="mailto:Qingqing.Zhuo@amd.com">Qingqing.Zhuo@amd.com</a>>; Leung, Martin
<<a href="mailto:Martin.Leung@amd.com">Martin.Leung@amd.com</a>>; Siqueira, Rodrigo <<a href="mailto:Rodrigo.Siqueira@amd.com">Rodrigo.Siqueira@amd.com</a>>; Li, Roman <<a href="mailto:Roman.Li@amd.com">Roman.Li@amd.com</a>>; Jacob, Anson <<a href="mailto:Anson.Jacob@amd.com">Anson.Jacob@amd.com</a>>;
Pillai, Aurabindo <<a href="mailto:Aurabindo.Pillai@amd.com">Aurabindo.Pillai@amd.com</a>>; Lin, Wayne <<a href="mailto:Wayne.Lin@amd.com">Wayne.Lin@amd.com</a>>; Lipski, Mikita <<a href="mailto:Mikita.Lipski@amd.com">Mikita.Lipski@amd.com</a>>; Lakha, Bhawanpreet
<<a href="mailto:Bhawanpreet.Lakha@amd.com">Bhawanpreet.Lakha@amd.com</a>>; Gutierrez, Agustin <<a href="mailto:Agustin.Gutierrez@amd.com">Agustin.Gutierrez@amd.com</a>>; Kotarac, Pavle <<a href="mailto:Pavle.Kotarac@amd.com">Pavle.Kotarac@amd.com</a>><br>
<b>Subject:</b> [PATCH 14/16] drm/amd/display: add else to avoid double destroy clk_mgr</span>
<o:p></o:p></p>
<div>
<p class="MsoNormal"> <o:p></o:p></p>
</div>
</div>
<div>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt">From: Martin Leung <<a href="mailto:Martin.Leung@amd.com">Martin.Leung@amd.com</a>><br>
<br>
[Why & How]<br>
when changing some code we accidentally<br>
changed else if-> if. reverting that.<br>
<br>
Reviewed-by: Aric Cyr <<a href="mailto:Aric.Cyr@amd.com">Aric.Cyr@amd.com</a>><br>
Acked-by: Qingqing Zhuo <<a href="mailto:qingqing.zhuo@amd.com">qingqing.zhuo@amd.com</a>><br>
Signed-off-by: Martin Leung <<a href="mailto:Martin.Leung@amd.com">Martin.Leung@amd.com</a>><br>
---<br>
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 3 +--<br>
1 file changed, 1 insertion(+), 2 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c<br>
index 26f96ee32472..9200c8ce02ba 100644<br>
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c<br>
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c<br>
@@ -308,8 +308,7 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base)<br>
case FAMILY_NV:<br>
if (ASICREV_IS_SIENNA_CICHLID_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) {<br>
dcn3_clk_mgr_destroy(clk_mgr);<br>
- }<br>
- if (ASICREV_IS_DIMGREY_CAVEFISH_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) {<br>
+ } else if (ASICREV_IS_DIMGREY_CAVEFISH_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) {<br>
dcn3_clk_mgr_destroy(clk_mgr);<br>
}<br>
if (ASICREV_IS_BEIGE_GOBY_P(clk_mgr_base->ctx->asic_id.hw_internal_rev)) {<br>
-- <br>
2.25.1<o:p></o:p></p>
</div>
</div>
</div>
</div>
</body>
</html>