[PATCH 1/2] Revert "drm/amdkfd: fix boot failure when iommu is disabled in Picasso."

[Ken Moffat]

On Tue, Nov 02, 2021 at 09:00:04PM +0000, Zhu, James wrote:
> [AMD Official Use Only]
> 
> 
> Hi Alex
> 
> Sure, Let me check it can be merged into one patch.
> 
> 
> Thanks & Best Regards!
> 
> 
> James Zhu
> 

Hi James,

I'm trying to apply these to 5.15.0 (using the dry-run option of
traditional patch, kernel source is from the tarball).

the first one fails:

Reversed (or previously applied) patch detected!  Assume -R? [n]

it will revert:
Hunk #1 succeeded at 924 with fuzz 2 (offset -107 lines).

In anything connected to the kernel, fuzz on a patch worries me.
Should I apply this with patch -p1 -R ?

For the second patch:

checking file drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Hunk #1 succeeded at 2432 (offset 34 lines).
checking file drivers/gpu/drm/amd/amdkfd/kfd_device.c
Hunk #1 succeeded at 924 with fuzz 2 (offset -107 lines).

Again, note the fuzz in kfd_device.c.

Using 'git apply --check' instead of 'patch' both patches report the
same failure for kfd_device.c:

error: patch failed: drivers/gpu/drm/amd/amdkfd/kfd_device.c:1031
error: drivers/gpu/drm/amd/amdkfd/kfd_device.c: patch does not apply

ĸen
-- 
Vetinari smiled. "Can you keep a secret, Mister Lipwig?"
"Oh, yes, sir. I've kept lots."
"Capital. And the point is, so can I. You do not need to know.”