mirror of
git://slackware.nl/current.git
synced 2024-12-31 10:28:29 +01:00
8b116857fe
patches/packages/linux-5.15.161/*: Upgraded. These updates fix regressions with the 5.15.160 packages. Hopefully we do not get any new ones. :-) Be sure to upgrade your initrd after upgrading the kernel packages. If you use lilo to boot your machine, be sure lilo.conf points to the correct kernel and initrd and run lilo as root to update the bootloader. If you use elilo to boot your machine, you should run eliloconfig to copy the kernel and initrd to the EFI System Partition.
58 lines
2 KiB
Diff
58 lines
2 KiB
Diff
From: Armin Wolf <W_Armin@gmx.de>
|
|
To: alexander.deucher@amd.com, christian.koenig@amd.com,
|
|
Xinhui.Pan@amd.com, gregkh@linuxfoundation.org,
|
|
sashal@kernel.org
|
|
Cc: stable@vger.kernel.org, bkauler@gmail.com, yifan1.zhang@amd.com,
|
|
Prike.Liang@amd.com, dri-devel@lists.freedesktop.org,
|
|
amd-gfx@lists.freedesktop.org
|
|
Subject: [PATCH] Revert "drm/amdgpu: init iommu after amdkfd device init"
|
|
Date: Thu, 23 May 2024 19:30:31 +0200 [thread overview]
|
|
Message-ID: <20240523173031.4212-1-W_Armin@gmx.de> (raw)
|
|
|
|
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@gmail.com>
|
|
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
|
|
---
|
|
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
|
index 222a1d9ecf16..5f6c32ec674d 100644
|
|
--- 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 amdgpu_device *adev)
|
|
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 amdgpu_device *adev)
|
|
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:
|
|
--
|
|
2.39.2
|
|
|