Skip to content

Commit bf1c2c8

Browse files
Wer-WolfFlorian Bezannier
authored and
Florian Bezannier
committed
Revert "drm/amdgpu: init iommu after amdkfd device init"
This reverts commit 56b522f. 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 <[email protected]> Signed-off-by: Armin Wolf <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b26d4c7 commit bf1c2c8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -2487,6 +2487,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
24872487
if (r)
24882488
goto init_failed;
24892489

2490+
r = amdgpu_amdkfd_resume_iommu(adev);
2491+
if (r)
2492+
goto init_failed;
2493+
24902494
r = amdgpu_device_ip_hw_init_phase1(adev);
24912495
if (r)
24922496
goto init_failed;
@@ -2525,10 +2529,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
25252529
if (!adev->gmc.xgmi.pending_reset)
25262530
amdgpu_amdkfd_device_init(adev);
25272531

2528-
r = amdgpu_amdkfd_resume_iommu(adev);
2529-
if (r)
2530-
goto init_failed;
2531-
25322532
amdgpu_fru_get_product_info(adev);
25332533

25342534
init_failed:

0 commit comments

Comments
 (0)