Patch "Revert "drm/amdgpu: init iommu after amdkfd device init"" has been added to the 5.15-stable tree

[Armin Wolf]

Am 12.06.24 um 14:45 schrieb gregkh at linuxfoundation.org:

> This is a note to let you know that I've just added the patch titled
>
>      Revert "drm/amdgpu: init iommu after amdkfd device init"
>
> to the 5.15-stable tree which can be found at:
>      http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
>       revert-drm-amdgpu-init-iommu-after-amdkfd-device-init.patch
> and it can be found in the queue-5.15 subdirectory.

Thank you :)

>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable at vger.kernel.org> know about it.
>
>
>  From W_Armin at gmx.de  Wed Jun 12 14:43:21 2024
> From: Armin Wolf <W_Armin at gmx.de>
> Date: Thu, 23 May 2024 19:30:31 +0200
> Subject: Revert "drm/amdgpu: init iommu after amdkfd device init"
> To: alexander.deucher at amd.com, christian.koenig at amd.com, Xinhui.Pan at amd.com, gregkh at linuxfoundation.org, sashal at kernel.org
> Cc: stable at vger.kernel.org, bkauler at gmail.com, yifan1.zhang at amd.com, Prike.Liang at amd.com, dri-devel at lists.freedesktop.org, amd-gfx at lists.freedesktop.org
> Message-ID: <20240523173031.4212-1-W_Armin at gmx.de>
>
> From: Armin Wolf <W_Armin at gmx.de>
>
> This reverts commit 56b522f4668167096a50c39446d6263c96219f5f.
>
> A user reported that this commit breaks the integrated gpu of his
> notebook, causing a black screen. He was able to bisect the problematic
> commit and verified that by reverting it the notebook works again.
> He also confirmed that kernel 6.8.1 also works on his device, so the
> upstream commit itself seems to be ok.
>
> An amdgpu developer (Alex Deucher) confirmed that this patch should
> have never been ported to 5.15 in the first place, so revert this
> commit from the 5.15 stable series.
>
> Reported-by: Barry Kauler <bkauler at gmail.com>
> Signed-off-by: Armin Wolf <W_Armin at gmx.de>
> Link: https://lore.kernel.org/r/20240523173031.4212-1-W_Armin@gmx.de
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |    8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2487,6 +2487,10 @@ static int amdgpu_device_ip_init(struct
>   	if (r)
>   		goto init_failed;
>
> +	r = amdgpu_amdkfd_resume_iommu(adev);
> +	if (r)
> +		goto init_failed;
> +
>   	r = amdgpu_device_ip_hw_init_phase1(adev);
>   	if (r)
>   		goto init_failed;
> @@ -2525,10 +2529,6 @@ static int amdgpu_device_ip_init(struct
>   	if (!adev->gmc.xgmi.pending_reset)
>   		amdgpu_amdkfd_device_init(adev);
>
> -	r = amdgpu_amdkfd_resume_iommu(adev);
> -	if (r)
> -		goto init_failed;
> -
>   	amdgpu_fru_get_product_info(adev);
>
>   init_failed:
>
>
> Patches currently in stable-queue which might be from W_Armin at gmx.de are
>
> queue-5.15/revert-drm-amdgpu-init-iommu-after-amdkfd-device-init.patch