<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=utf-8">
<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;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
h3
{mso-style-priority:9;
mso-style-link:"Heading 3 Char";
mso-margin-top-alt:auto;
margin-right:0in;
mso-margin-bottom-alt:auto;
margin-left:0in;
font-size:13.5pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
span.Heading3Char
{mso-style-name:"Heading 3 Char";
mso-style-priority:9;
mso-style-link:"Heading 3";
font-family:"Calibri",sans-serif;
font-weight:bold;}
p.msonormal0, li.msonormal0, div.msonormal0
{mso-style-name:msonormal;
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;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Calibri",sans-serif;}
span.EmailStyle22
{mso-style-type:personal-reply;
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">
<div class="WordSection1">
<p class="MsoNormal">Resend in case of missing.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><b>Hi Alex,<o:p></o:p></b></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">I need your help to merge libdrm patches from my personal repository below to drm master branch.<o:p></o:p></p>
<p class="MsoNormal">Thanks.<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Regards,<o:p></o:p></p>
<p class="MsoNormal">Guchun<o:p></o:p></p>
</div>
<p class="MsoNormal"><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> Chen, Guchun <br>
<b>Sent:</b> Friday, August 30, 2019 2:19 PM<br>
<b>To:</b> 'Michel Dänzer' <michel@daenzer.net>; 'Alex Deucher' <alexdeucher@gmail.com><br>
<b>Cc:</b> Zhou1, Tao <Tao.Zhou1@amd.com>; 'amd-gfx@lists.freedesktop.org' <amd-gfx@lists.freedesktop.org>; Deucher, Alexander <Alexander.Deucher@amd.com>; Li, Candice <Candice.Li@amd.com>; Li, Dennis <Dennis.Li@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>;
Koenig, Christian <Christian.Koenig@amd.com><br>
<b>Subject:</b> RE: libdrm patch merge request<o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoPlainText">Hi Alex,<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Please help apply below 4 patches from my personal gitlab repository to drm master branch. CI pipeline passes with these 4 changes.<o:p></o:p></p>
<p class="MsoPlainText">These patches are:<o:p></o:p></p>
<p class="MsoPlainText">1) to remove external libjson-c dependence to keep amdgpu_test self-containing, and to fix the build problem mentioned below by Michel as well.<o:p></o:p></p>
<p class="MsoPlainText">2) to move all unit test configurations to C code.<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"><a href="https://gitlab.freedesktop.org/guchunchen/drm">https://gitlab.freedesktop.org/guchunchen/drm</a><o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Patch 1: <a href="https://gitlab.freedesktop.org/guchunchen/drm/commit/a78c71f1336b7891267dc2bc44a8dfc34ce76357">
amdgpu: remove json package dependence</a><o:p></o:p></p>
<p class="MsoNormal" style="background:white"><span style="color:#2E2E2E">Patch 2:
<a href="https://gitlab.freedesktop.org/guchunchen/drm/commit/ccd263511526d836a2782090a5df3d15870f2cbc">
amdgpu: delete test configuration file</a><o:p></o:p></span></p>
<h3 style="margin:0in;margin-bottom:.0001pt;background:white"><span style="font-size:11.0pt;color:#2E2E2E;font-weight:normal">Patch 3:
<a href="https://gitlab.freedesktop.org/guchunchen/drm/commit/7562611122ea64f0b590361963b38f6a33b3389d">
amdgpu: add ras inject unit test</a><o:p></o:p></span></h3>
<h3 style="margin:0in;margin-bottom:.0001pt;background:white"><span style="font-size:11.0pt;color:#2E2E2E;font-weight:normal">Patch 4:
<a href="https://gitlab.freedesktop.org/guchunchen/drm/commit/0405bc2f9138fe1b863160bb5c42d201631f6e15">
amdgpu: add ras feature capability check in inject test</a><o:p></o:p></span></h3>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Regards,<o:p></o:p></p>
<p class="MsoPlainText">Guchun<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: Chen, Guchun <o:p></o:p></p>
<p class="MsoPlainText">Sent: Monday, August 12, 2019 11:22 AM<o:p></o:p></p>
<p class="MsoPlainText">To: 'Michel Dänzer' <<a href="mailto:michel@daenzer.net">michel@daenzer.net</a>>; Alex Deucher <<a href="mailto:alexdeucher@gmail.com">alexdeucher@gmail.com</a>><o:p></o:p></p>
<p class="MsoPlainText">Cc: Zhou1, Tao <<a href="mailto:Tao.Zhou1@amd.com">Tao.Zhou1@amd.com</a>>;
<a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a>; Deucher, Alexander <<a href="mailto:Alexander.Deucher@amd.com">Alexander.Deucher@amd.com</a>>; Li, Candice <<a href="mailto:Candice.Li@amd.com">Candice.Li@amd.com</a>>; Li, Dennis
<<a href="mailto:Dennis.Li@amd.com">Dennis.Li@amd.com</a>>; Zhang, Hawking <<a href="mailto:Hawking.Zhang@amd.com">Hawking.Zhang@amd.com</a>><o:p></o:p></p>
<p class="MsoPlainText">Subject: RE: libdrm patch merge request<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Hi Michel,<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">My bad. Sorry for that.<o:p></o:p></p>
<p class="MsoPlainText">My solution is to take the first suggestion from you, will prepare one patch soon for this.<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Regards,<o:p></o:p></p>
<p class="MsoPlainText">Guchun<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: Michel Dänzer <<a href="mailto:michel@daenzer.net">mailto:michel@daenzer.net</a>>
<o:p></o:p></p>
<p class="MsoPlainText">Sent: Friday, August 9, 2019 10:13 PM<o:p></o:p></p>
<p class="MsoPlainText">To: Chen, Guchun <<a href="mailto:Guchun.Chen@amd.com">mailto:Guchun.Chen@amd.com</a>>; Alex Deucher <<a href="mailto:alexdeucher@gmail.com">mailto:alexdeucher@gmail.com</a>><o:p></o:p></p>
<p class="MsoPlainText">Cc: Zhou1, Tao <<a href="mailto:Tao.Zhou1@amd.com">mailto:Tao.Zhou1@amd.com</a>>;
<a href="mailto:amd-gfx@lists.freedesktop.org">mailto:amd-gfx@lists.freedesktop.org</a>; Deucher, Alexander <<a href="mailto:Alexander.Deucher@amd.com">mailto:Alexander.Deucher@amd.com</a>>; Li, Candice <<a href="mailto:Candice.Li@amd.com">mailto:Candice.Li@amd.com</a>>;
Li, Dennis <<a href="mailto:Dennis.Li@amd.com">mailto:Dennis.Li@amd.com</a>>; Zhang, Hawking <<a href="mailto:Hawking.Zhang@amd.com">mailto:Hawking.Zhang@amd.com</a>><o:p></o:p></p>
<p class="MsoPlainText">Subject: Re: libdrm patch merge request<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">This broke the CI pipeline:<o:p></o:p></p>
<p class="MsoPlainText"><a href="https://gitlab.freedesktop.org/mesa/drm/pipelines/54903">https://gitlab.freedesktop.org/mesa/drm/pipelines/54903</a><o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Looks like the problem is that the autotools build doesn't properly disable the amdgpu tests when the json-c library is missing. I suggest the following:<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">1. Add a HAVE_JSONC guard in tests/Makefile.am 2. Add libjson-c-dev to the packages installed by the oldest-autotools<o:p></o:p></p>
<p class="MsoPlainText"> job in .gitlab-ci.yml<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Until libdrm uses GitLab merge requests to catch this kind of issue before it hits master, please push changes to a branch in a forked personal repository and make sure the CI pipeline comes back green before asking for them to be pushed
to master.<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Thanks,<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">On 2019-08-09 3:25 a.m., Chen, Guchun wrote:<o:p></o:p></p>
<p class="MsoPlainText">> Thanks, Alex.<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> Regards,<o:p></o:p></p>
<p class="MsoPlainText">> Guchun<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: Alex Deucher <<a href="mailto:alexdeucher@gmail.com">mailto:alexdeucher@gmail.com</a>><o:p></o:p></p>
<p class="MsoPlainText">> Sent: Friday, August 9, 2019 1:24 AM<o:p></o:p></p>
<p class="MsoPlainText">> To: Chen, Guchun <<a href="mailto:Guchun.Chen@amd.com">mailto:Guchun.Chen@amd.com</a>><o:p></o:p></p>
<p class="MsoPlainText">> Cc: Deucher, Alexander <<a href="mailto:Alexander.Deucher@amd.com">mailto:Alexander.Deucher@amd.com</a>>;
<o:p></o:p></p>
<p class="MsoPlainText">> <a href="mailto:amd-gfx@lists.freedesktop.org">mailto:amd-gfx@lists.freedesktop.org</a>; Zhou1, Tao <<a href="mailto:Tao.Zhou1@amd.com">mailto:Tao.Zhou1@amd.com</a>>; Li,
<o:p></o:p></p>
<p class="MsoPlainText">> Candice <<a href="mailto:Candice.Li@amd.com">mailto:Candice.Li@amd.com</a>>; Li, Dennis <<a href="mailto:Dennis.Li@amd.com">mailto:Dennis.Li@amd.com</a>>; Zhang,
<o:p></o:p></p>
<p class="MsoPlainText">> Hawking <<a href="mailto:Hawking.Zhang@amd.com">mailto:Hawking.Zhang@amd.com</a>><o:p></o:p></p>
<p class="MsoPlainText">> Subject: Re: libdrm patch merge request<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> Done!<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> Alex<o:p></o:p></p>
<p class="MsoPlainText">> <o:p></o:p></p>
<p class="MsoPlainText">> On Thu, Aug 8, 2019 at 5:18 AM Chen, Guchun <<a href="mailto:Guchun.Chen@amd.com">mailto:Guchun.Chen@amd.com</a>> wrote:<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> Hi Alex,<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">>> Would you mind merging attached 3 patches to libdrm master branch?<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> These changes are implemented for gfx and umc ras inject unit test by amdgpu_test.<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> Thanks a lot.<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">>> Regards,<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> Guchun<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">>> _______________________________________________<o:p></o:p></p>
<p class="MsoPlainText">>> amd-gfx mailing list<o:p></o:p></p>
<p class="MsoPlainText">>> <a href="mailto:amd-gfx@lists.freedesktop.org">mailto:amd-gfx@lists.freedesktop.org</a><o:p></o:p></p>
<p class="MsoPlainText">>> <a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">
https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a><o:p></o:p></p>
<p class="MsoPlainText">> _______________________________________________<o:p></o:p></p>
<p class="MsoPlainText">> amd-gfx mailing list<o:p></o:p></p>
<p class="MsoPlainText">> <a href="mailto:amd-gfx@lists.freedesktop.org">mailto:amd-gfx@lists.freedesktop.org</a><o:p></o:p></p>
<p class="MsoPlainText">> <a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">
https://lists.freedesktop.org/mailman/listinfo/amd-gfx</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"><o:p> </o:p></p>
<p class="MsoPlainText">-- <o:p></o:p></p>
<p class="MsoPlainText">Earthling Michel Dänzer | <a href="https://www.amd.com">
https://www.amd.com</a><o:p></o:p></p>
<p class="MsoPlainText">Libre software enthusiast | Mesa and X developer<o:p></o:p></p>
</div>
</body>
</html>