linux514-tkg: Revert 2602e9cc as it breaks various amd platforms
https://github.com/Frogging-Family/linux-tkg/issues/340 https://bugzilla.kernel.org/show_bug.cgi?id=214859 Fixes https://github.com/Frogging-Family/linux-tkg/issues/340
This commit is contained in:
4
PKGBUILD
4
PKGBUILD
@@ -59,7 +59,7 @@ else
|
|||||||
fi
|
fi
|
||||||
pkgname=("${pkgbase}" "${pkgbase}-headers")
|
pkgname=("${pkgbase}" "${pkgbase}-headers")
|
||||||
pkgver="${_basekernel}"."${_sub}"
|
pkgver="${_basekernel}"."${_sub}"
|
||||||
pkgrel=209
|
pkgrel=210
|
||||||
pkgdesc='Linux-tkg'
|
pkgdesc='Linux-tkg'
|
||||||
arch=('x86_64') # no i686 in here
|
arch=('x86_64') # no i686 in here
|
||||||
url="http://www.kernel.org/"
|
url="http://www.kernel.org/"
|
||||||
@@ -590,7 +590,7 @@ case $_basever in
|
|||||||
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
|
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
|
||||||
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
|
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
|
||||||
'2e2247183034fa4a2ea1cd943d3d24ee9ea52daf70d47e69d5564f8ac1367aa2'
|
'2e2247183034fa4a2ea1cd943d3d24ee9ea52daf70d47e69d5564f8ac1367aa2'
|
||||||
'1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887'
|
'd456fe1fbcbaf6767f653f60e45b089d3964b53e815ca1fe185b7c847fb2b82a'
|
||||||
'1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
|
'1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
|
||||||
'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6')
|
'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6')
|
||||||
;;
|
;;
|
||||||
|
@@ -187,3 +187,37 @@ index 7de599eba7f0..62a5986d625a 100644
|
|||||||
|
|
||||||
--
|
--
|
||||||
2.25.1
|
2.25.1
|
||||||
|
|
||||||
|
Subject: Revert drm/amdgpu: init iommu after amdkfd device init
|
||||||
|
This reportedly breaks multiple amd platforms
|
||||||
|
|
||||||
|
https://github.com/Frogging-Family/linux-tkg/issues/340
|
||||||
|
https://bugzilla.kernel.org/show_bug.cgi?id=214859
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||||
|
index d60096b3b2c2a..cd8cc7d31b49c 100644
|
||||||
|
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||||
|
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||||
|
@@ -2342,6 +2342,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;
|
||||||
|
@@ -2384,10 +2380,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:
|
||||||
|
Reference in New Issue
Block a user