|
[AMD Official Use Only]
Hi Alex
Sure, Let me check it can be merged into one patch.
Thanks & Best Regards!
James Zhu From: Alex Deucher <alexdeucher@xxxxxxxxx>
Sent: Tuesday, November 2, 2021 4:34 PM To: Zhu, James <James.Zhu@xxxxxxx> Cc: amd-gfx list <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>; Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Zhang, Yifan <Yifan1.Zhang@xxxxxxx>; Zhu, James <James.Zhu@xxxxxxx>; Ken Moffat <zarniwhoop@xxxxxxxxxxxx> Subject: Re: [PATCH 1/2] Revert "drm/amdkfd: fix boot failure when iommu is disabled in Picasso." On Tue, Nov 2, 2021 at 3:23 PM James Zhu <James.Zhu@xxxxxxx> wrote:
> > To revert wrong merge during rebase. > This reverts commit afd18180c07026f94a80ff024acef5f4159084a4. Missing your signed-off-by. Might be better to just merge these two patches into one unless they are individually applicable to different kernels (e.g., 5.15 vs drm-next). Also these will probably fix the following: Bug: https://nam11.safelinks.protection.outlook.com/?url=""> Bug: https://nam11.safelinks.protection.outlook.com/?url=""> Alex > --- > drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > index 7677ced16a27..be26c4016ade 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > @@ -1031,9 +1031,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, > > svm_migrate_init(kfd->adev); > > - if(kgd2kfd_resume_iommu(kfd)) > - goto device_iommu_error; > - > if (kfd_resume(kfd)) > goto kfd_resume_error; > > -- > 2.25.1 > |
