<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<p style="font-family:Arial;font-size:10pt;color:#0000FF;margin:5pt;" align="Left">
[AMD Official Use Only]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Hi Alex</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Sure, Let me check it can be merged into one patch.</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div id="Signature">
<div>
<div id="divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:#000000; font-family:Calibri,Arial,Helvetica,sans-serif">
<p style="margin-top: 0px; margin-bottom: 0px;">Thanks & Best Regards!</p>
<p style="margin-top: 0px; margin-bottom: 0px;"><br>
</p>
<p style="margin-top: 0px; margin-bottom: 0px;">James Zhu<br>
</p>
</div>
</div>
</div>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Alex Deucher <alexdeucher@gmail.com><br>
<b>Sent:</b> Tuesday, November 2, 2021 4:34 PM<br>
<b>To:</b> Zhu, James <James.Zhu@amd.com><br>
<b>Cc:</b> amd-gfx list <amd-gfx@lists.freedesktop.org>; Deucher, Alexander <Alexander.Deucher@amd.com>; Zhang, Yifan <Yifan1.Zhang@amd.com>; Zhu, James <James.Zhu@amd.com>; Ken Moffat <zarniwhoop@ntlworld.com><br>
<b>Subject:</b> Re: [PATCH 1/2] Revert "drm/amdkfd: fix boot failure when iommu is disabled in Picasso."</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">On Tue, Nov 2, 2021 at 3:23 PM James Zhu <James.Zhu@amd.com> wrote:<br>
><br>
> To revert wrong merge during rebase.<br>
> This reverts commit afd18180c07026f94a80ff024acef5f4159084a4.<br>
<br>
Missing your signed-off-by. Might be better to just merge these two<br>
patches into one unless they are individually applicable to different<br>
kernels (e.g., 5.15 vs drm-next). Also these will probably fix the<br>
following:<br>
Bug: <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.kernel.org%2Fshow_bug.cgi%3Fid%3D214859&data=04%7C01%7CJames.Zhu%40amd.com%7Cd89a2e71a6204428008908d99e40368f%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637714820908943450%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=wOmavKInLZrl3Qge2N83kgMh2dATo4aUH%2BW6QrPvL30%3D&reserved=0">
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.kernel.org%2Fshow_bug.cgi%3Fid%3D214859&data=04%7C01%7CJames.Zhu%40amd.com%7Cd89a2e71a6204428008908d99e40368f%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637714820908943450%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=wOmavKInLZrl3Qge2N83kgMh2dATo4aUH%2BW6QrPvL30%3D&reserved=0</a><br>
Bug: <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fdrm%2Famd%2F-%2Fissues%2F1770&data=04%7C01%7CJames.Zhu%40amd.com%7Cd89a2e71a6204428008908d99e40368f%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637714820908943450%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=k3GJBSFKw8FJhGs9Urpm8PmFPzN7m0LFl5p7Wv1FfGY%3D&reserved=0">
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.freedesktop.org%2Fdrm%2Famd%2F-%2Fissues%2F1770&data=04%7C01%7CJames.Zhu%40amd.com%7Cd89a2e71a6204428008908d99e40368f%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637714820908943450%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=k3GJBSFKw8FJhGs9Urpm8PmFPzN7m0LFl5p7Wv1FfGY%3D&reserved=0</a><br>
<br>
Alex<br>
<br>
> ---<br>
> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 ---<br>
> 1 file changed, 3 deletions(-)<br>
><br>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c<br>
> index 7677ced16a27..be26c4016ade 100644<br>
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c<br>
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c<br>
> @@ -1031,9 +1031,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,<br>
><br>
> svm_migrate_init(kfd->adev);<br>
><br>
> - if(kgd2kfd_resume_iommu(kfd))<br>
> - goto device_iommu_error;<br>
> -<br>
> if (kfd_resume(kfd))<br>
> goto kfd_resume_error;<br>
><br>
> --<br>
> 2.25.1<br>
><br>
</div>
</span></font></div>
</div>
</body>
</html>