<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;
margin-bottom:.0001pt;
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.msipheader4d0fcdd7, li.msipheader4d0fcdd7, div.msipheader4d0fcdd7
{mso-style-name:msipheader4d0fcdd7;
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">
<p style="font-family:Arial;font-size:10pt;color:#0078D7;margin:15pt;" align="Left">
[AMD Official Use Only - Internal Distribution Only]<br>
</p>
<br>
<div>
<div class="WordSection1">
<p class="msipheader4d0fcdd7" style="margin:0in;margin-bottom:.0001pt"><span style="font-size:10.0pt;font-family:"Arial",sans-serif;color:#0078D7">[AMD Official Use Only - Internal Distribution Only]</span><o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Merged.<o:p></o:p></p>
<p class="MsoNormal">Thanks for review.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">-Leo<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> Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com> <br>
<b>Sent:</b> Monday, May 11, 2020 3:51 PM<br>
<b>To:</b> Ma, Hanghong <Hanghong.Ma@amd.com>; Wentland, Harry <Harry.Wentland@amd.com><br>
<b>Cc:</b> amd-gfx@lists.freedesktop.org<br>
<b>Subject:</b> Re: [PATCH] drm/amd/amdgpu: Update update_config() logic<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:#0078D7">[AMD Official Use Only - Internal Distribution Only]<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">Reviewed-by: Bhawanpreet Lakha <<a href="mailto:Bhawanpreet.Lakha@amd.com">Bhawanpreet.Lakha@amd.com</a>><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"> Ma, Hanghong <<a href="mailto:Hanghong.Ma@amd.com">Hanghong.Ma@amd.com</a>><br>
<b>Sent:</b> May 11, 2020 3:48 PM<br>
<b>To:</b> Wentland, Harry <<a href="mailto:Harry.Wentland@amd.com">Harry.Wentland@amd.com</a>><br>
<b>Cc:</b> Lakha, Bhawanpreet <<a href="mailto:Bhawanpreet.Lakha@amd.com">Bhawanpreet.Lakha@amd.com</a>>;
<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>Subject:</b> RE: [PATCH] drm/amd/amdgpu: Update update_config() logic</span> <o:p>
</o:p></p>
<div>
<p class="MsoNormal"> <o:p></o:p></p>
</div>
</div>
<div>
<div>
<p class="MsoNormal">[AMD Official Use Only - Internal Distribution Only]<br>
<br>
Thanks Harry.<br>
I will drop the Change-Id before merging.<br>
<br>
-Leo<br>
<br>
-----Original Message-----<br>
From: Wentland, Harry <<a href="mailto:Harry.Wentland@amd.com">Harry.Wentland@amd.com</a>>
<br>
Sent: Monday, May 11, 2020 3:46 PM<br>
To: Ma, Hanghong <<a href="mailto:Hanghong.Ma@amd.com">Hanghong.Ma@amd.com</a>>; Lakha, Bhawanpreet <<a href="mailto:Bhawanpreet.Lakha@amd.com">Bhawanpreet.Lakha@amd.com</a>>;
<a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><br>
Cc: Wentland, Harry <<a href="mailto:Harry.Wentland@amd.com">Harry.Wentland@amd.com</a>><br>
Subject: Re: [PATCH] drm/amd/amdgpu: Update update_config() logic<br>
<br>
On 2020-05-11 3:28 p.m., Leo (Hanghong) Ma wrote:<br>
> [Why]<br>
> For MST case: when update_config is called to disable a stream, this <br>
> clears the settings for all the streams on that link.<br>
> We should only clear the settings for the stream that was disabled.<br>
> <br>
> [How]<br>
> Clear the settings after the call to remove display is called.<br>
> <br>
> Change-Id: I8235998b8fac3d58d24edf86bb5d7cc030f1e375<br>
<br>
Please drop the Change-Id before merging.<br>
<br>
> Signed-off-by: Leo (Hanghong) Ma <<a href="mailto:hanghong.ma@amd.com">hanghong.ma@amd.com</a>><br>
<br>
Reviewed-by: Harry Wentland <<a href="mailto:harry.wentland@amd.com">harry.wentland@amd.com</a>><br>
<br>
Harry<br>
<br>
> ---<br>
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 10 <br>
> +++++-----<br>
> 1 file changed, 5 insertions(+), 5 deletions(-)<br>
> <br>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c <br>
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c<br>
> index 78e1c11d4ae5..dcf84a61de37 100644<br>
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c<br>
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c<br>
> @@ -398,15 +398,15 @@ static void update_config(void *handle, struct cp_psp_stream_config *config)<br>
> struct mod_hdcp_display *display = &hdcp_work[link_index].display;<br>
> struct mod_hdcp_link *link = &hdcp_work[link_index].link;<br>
> <br>
> - memset(display, 0, sizeof(*display));<br>
> - memset(link, 0, sizeof(*link));<br>
> -<br>
> - display->index = aconnector->base.index;<br>
> -<br>
> if (config->dpms_off) {<br>
> hdcp_remove_display(hdcp_work, link_index, aconnector);<br>
> return;<br>
> }<br>
> +<br>
> + memset(display, 0, sizeof(*display));<br>
> + memset(link, 0, sizeof(*link));<br>
> +<br>
> + display->index = aconnector->base.index;<br>
> display->state = MOD_HDCP_DISPLAY_ACTIVE;<br>
> <br>
> if (aconnector->dc_sink != NULL)<br>
> <o:p></o:p></p>
</div>
</div>
</div>
</div>
</div>
</body>
</html>